[zanata/zanata-server] 4c4935: Squashed commit of the following (PR642):
GitHub
noreply at github.com
Tue Apr 28 01:48:04 UTC 2015
Branch: refs/heads/integration/master
Home: https://github.com/zanata/zanata-server
Commit: 4c493547d5cb12fd0f607201917afc669757674e
https://github.com/zanata/zanata-server/commit/4c493547d5cb12fd0f607201917afc669757674e
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-04-28 (Tue, 28 Apr 2015)
Changed paths:
M functional-test/pom.xml
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M functional-test/src/test/resources/log4j.xml
M pom.xml
M zanata-model/pom.xml
A zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
A zanata-model/src/test/java/org/zanata/model/validator/UrlValidatorTest.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/action/validator/DuplicateEmailValidator.java
M zanata-war/src/main/java/org/zanata/action/validator/EmailListValidator.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
M zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
R zanata-war/src/main/java/org/zanata/validation/PatchedCaptcha.java
R zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponse.java
R zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponseValidator.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
M zanata-war/src/main/resources/messages_nl.properties
M zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M zanata-war/src/test/java/org/zanata/RestTest.java
M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
A zanata-war/src/test/java/org/zanata/action/validator/DuplicateEmailValidatorTest.java
M zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
M zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
A zanata-war/src/test/java/org/zanata/notification/DeadLetterQueueReceiverTest.java
A zanata-war/src/test/java/org/zanata/notification/EmailQueueMessageReceiverTest.java
A zanata-war/src/test/java/org/zanata/notification/ExpiryLetterQueueReceiverTest.java
A zanata-war/src/test/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandlerTest.java
A zanata-war/src/test/java/org/zanata/notification/MessageUnwrapperTest.java
A zanata-war/src/test/java/org/zanata/notification/NotificationManagerTest.java
M zanata-war/src/test/java/org/zanata/rest/ResourceRequest.java
R zanata-war/src/test/java/org/zanata/rest/compat/AccountCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
A zanata-war/src/test/java/org/zanata/rest/compat/CompatibilityBase.java
R zanata-war/src/test/java/org/zanata/rest/compat/ProjectCompatibilityITCase.java
R zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
R zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/TextFlowServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
R zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ProjectIterationRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ProjectsServiceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceTestUtil.java
R zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/VersionRestTest.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/CopyTransRestITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectIterationRawRestITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRawRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectsRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestTest.java
A zanata-war/src/test/java/org/zanata/ui/ActivityEntryTest.java
A zanata-war/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
M zanata-war/src/test/java/org/zanata/util/RawRestTestUtils.java
R zanata-war/src/test/java/org/zanata/validator/SlugValidatorTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Squashed commit of the following (PR642):
https://github.com/zanata/zanata-server/pull/642
commit f2c2b7b66ddad082eb27535c1d108d0a52fe94b8
Merge: dfae212 7a5769a
Author: Patrick Huang <pahuang at redhat.com>
Date: Tue Apr 28 11:02:02 2015 +1000
Merge branch 'master' into jersey-boys
commit dfae212b45954d0e4f344f11f44af14a68d601f4
Author: Patrick Huang <pahuang at redhat.com>
Date: Thu Apr 23 15:25:23 2015 +1000
accept json in server configuration REST service and fix tests
commit 973a93a447e080e3af93ff731d60775c4580f31d
Merge: 5c0d9d7 a0152f0
Author: Patrick Huang <pahuang at redhat.com>
Date: Wed Apr 22 14:36:47 2015 +1000
Merge branch 'master' into jersey-boys
Conflicts:
zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
zanata-war/src/test/java/org/zanata/RestTest.java
commit 5c0d9d7b65bdc54668a8bccca180467634cc26bb
Author: Patrick Huang <pahuang at redhat.com>
Date: Thu Mar 26 20:49:07 2015 +1000
fix functional test
commit 2e9fdccda67cb3f0b1e2c8f8d5794c3aac85a86d
Author: Patrick Huang <pahuang at redhat.com>
Date: Thu Mar 26 17:16:20 2015 +1000
fix functional test
commit 10e3748640bdce7c8e1aee08136befcbd42bfae7
Author: Patrick Huang <pahuang at redhat.com>
Date: Thu Mar 26 14:12:50 2015 +1000
add json tests
commit 6131e6b2adb6eb44ee819667bac361787556b3a2
Author: Patrick Huang <pahuang at redhat.com>
Date: Thu Mar 26 13:04:48 2015 +1000
include exception in log
commit 27991b2c379215269a47a4f7296648625d882731
Author: Patrick Huang <pahuang at redhat.com>
Date: Fri Mar 20 14:13:27 2015 +1000
remove dependency of zanata client and tighten dup finder config
commit 3296a08687318c7cab3e22548cd2441129f80789
Author: Patrick Huang <pahuang at redhat.com>
Date: Fri Jan 23 14:45:35 2015 +1000
increase test coverage
commit 00da2a6f4d1d7615bbb4d3ce95187e688f153de1
Author: Patrick Huang <pahuang at redhat.com>
Date: Fri Jan 16 08:47:50 2015 +1000
rhbz1124630 - convert proxy based REST tests to raw REST tests
commit d1cdaca6396cac8344108c69f22099337cad1ec1
Author: Patrick Huang <pahuang at redhat.com>
Date: Mon Dec 1 14:21:22 2014 +1000
rhbz1124630 - move client interface to server to avoid massive change in testing
More information about the zanata-commits
mailing list