[zanata/zanata-server] e65841: complete translation merge concordion test case fo...
GitHub
noreply at github.com
Fri May 31 06:28:40 UTC 2013
Branch: refs/heads/integration/master
Home: https://github.com/zanata/zanata-server
Commit: e65841dd1f055021ec0b1ce2cbbad16f08bf38ec
https://github.com/zanata/zanata-server/commit/e65841dd1f055021ec0b1ce2cbbad16f08bf38ec
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/TranslationMergeService.java
A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
R zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAutoNonReviewable.java
R zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAutoReviewable.java
A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImport.java
R zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImportNonReviewable.java
R zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImportReviewable.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
A zanata-war/src/main/java/org/zanata/transformer/TargetCommentTransformer.java
A zanata-war/src/main/java/org/zanata/transformer/TargetTransformer.java
A zanata-war/src/main/java/org/zanata/transformer/Transformer.java
M zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
M zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeService.html
Log Message:
-----------
complete translation merge concordion test case for auto and refactoring
Commit: 23616af2c630dcc6c396a14e9fa7779b964ab08f
https://github.com/zanata/zanata-server/commit/23616af2c630dcc6c396a14e9fa7779b964ab08f
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeService.html
Log Message:
-----------
written concordion test cases for merge type IMPORT
Commit: 9bb4ca6eaa7eab3f6a269e8ffdef9d2574b285ff
https://github.com/zanata/zanata-server/commit/9bb4ca6eaa7eab3f6a269e8ffdef9d2574b285ff
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImport.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/transformer/TargetTransformer.java
M zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
M zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeService.html
Log Message:
-----------
refactro merge type IMPORT
Commit: cd673275095b842ecd73ca950af34f4c145ae606
https://github.com/zanata/zanata-server/commit/cd673275095b842ecd73ca950af34f4c145ae606
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
A zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeFirstTran.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
A zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceServerNullTest.groovy
M zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
A zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
M zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeService.html
A zanata-war/src/test/resources/org/zanata/service/impl/TranslationMergeServiceServerNull.html
Log Message:
-----------
add merge service and test for case when server has null target
Commit: c42c64913963d3650022ae5515cc8341be7298d8
https://github.com/zanata/zanata-server/commit/c42c64913963d3650022ae5515cc8341be7298d8
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
Log Message:
-----------
refactor TranslationServiceImpl to use merge service
Commit: 57684fca33c6c645d34b55e4b7315c106b839cfd
https://github.com/zanata/zanata-server/commit/57684fca33c6c645d34b55e4b7315c106b839cfd
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-war/pom.xml
Log Message:
-----------
promote concordion dep to server and tweek surefire to run junit and testng together
Commit: cd3ee9e0cf13269cca70a7d9a3ab64dc82144052
https://github.com/zanata/zanata-server/commit/cd3ee9e0cf13269cca70a7d9a3ab64dc82144052
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationMergeServiceFactoryTest.java
Log Message:
-----------
fix issues
Commit: 782a36f314caa9c6218155397aed1cc321817993
https://github.com/zanata/zanata-server/commit/782a36f314caa9c6218155397aed1cc321817993
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
Log Message:
-----------
clean up
Commit: 782ba42957123722642365a9360ddde24019f048
https://github.com/zanata/zanata-server/commit/782ba42957123722642365a9360ddde24019f048
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
Log Message:
-----------
rhbz953734 - fix issue save Approved will trigger another implicit save as Translated
Commit: 8e9e1b5b2580ff5490b21b480f0b39b3ae0941c8
https://github.com/zanata/zanata-server/commit/8e9e1b5b2580ff5490b21b480f0b39b3ae0941c8
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
rhbz953734 - fix style in translation history table
Commit: 67e4e085c2c00a48e7aa7f144d87cd958a2f7d5f
https://github.com/zanata/zanata-server/commit/67e4e085c2c00a48e7aa7f144d87cd958a2f7d5f
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-05-30 (Thu, 30 May 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
Log Message:
-----------
rhbz953734 - fix issue: jsp can't find setter
Compare: https://github.com/zanata/zanata-server/compare/79d2016a5582...67e4e085c2c0
More information about the zanata-commits
mailing list