[zanata/zanata] b2f7e9: Implement projecttype when generating config file:...

[GitHub]

  Branch: refs/heads/rhbz895280
  Home:   https://github.com/zanata/zanata
  Commit: b2f7e99985a652392db1f4c1ebabeaad9b3d9af0
      https://github.com/zanata/zanata/commit/b2f7e99985a652392db1f4c1ebabeaad9b3d9af0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/main/java/org/zanata/service/ConfigurationService.java
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java

  Log Message:
  -----------
  Implement projecttype when generating config file: https://bugzilla.redhat.com/show_bug.cgi?id=895280


  Commit: 6d55d9cb530f2aee0e1b4517827a184ed886902e
      https://github.com/zanata/zanata/commit/6d55d9cb530f2aee0e1b4517827a184ed886902e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  Merge branch 'rhbz895280' of github.com:zanata/zanata into rhbz895280

Conflicts:
	zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
	zanata-war/src/main/webapp/iteration/view.xhtml


Compare: https://github.com/zanata/zanata/compare/ea5227a84f4d...6d55d9cb530f