[zanata/zanata-server] 766cfc: Squashed commit of the following:

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 766cfc05ca19b2ac5004c1ab2ce105a96a1296e2
      https://github.com/zanata/zanata-server/commit/766cfc05ca19b2ac5004c1ab2ce105a96a1296e2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-06-26 (Fri, 26 Jun 2015)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    A zanata-war/src/main/java/org/zanata/rest/ZanataJacksonJsonProvider.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestVersionInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    M zanata-war/src/main/java/org/zanata/rest/service/RestUtils.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/AbstractResource.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/Application.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/EntityHomeWrapper.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceHome.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceQuery.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyBootstrap.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyContextInjectionInterceptor.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyResourceAdapter.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/SeamResteasyProviderFactory.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/SeamResteasyResourceFactory.java
    A zanata-war/src/main/java/org/zanata/seam/resteasy/package-info.java
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java
    M zanata-war/src/main/resources/META-INF/seam-deployment.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_tr.properties
    A zanata-war/src/main/resources/org/zanata/seam/resteasy/resteasy-2.3.xsd
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/test/java/org/zanata/MockResourceFactory.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java

  Log Message:
  -----------
  Squashed commit of the following:

commit 71d284ba8f988efaf6f15f6ceb86b18fcb562bd4
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 16:42:49 2015 +1000

    minor change

commit 5e952150d6c358aca438fa274c35c62933c05936
Merge: 772525a b817e15
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 13:55:21 2015 +1000

    Merge branch 'integration/master' into resteasy3

    Conflicts:
    	zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    	zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    	zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java

commit 772525afbbfc13d199f2fc204184d29d8d49dfaa
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 13:49:01 2015 +1000

    use jboss module instead of packaging the jar (javax.inject-api)

commit 11e8fca4df8ba81eab500251d3ec22ef6b78abe9
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Jun 18 11:59:46 2015 +1000

    fix functional test

commit 1c34b8beee15681af8f0bd0e3679a83b983c9975
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 14:15:11 2015 +1000

    fix all static analysis error and added enforcer rule for stax-api conflict

commit 459b17f7be51c1ae46ff96f58e8784728ebbb076
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 12:54:03 2015 +1000

    fix duplicate class finder error

commit 9c0b497bba438f52125146cea35c0b92c3927136
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 12:08:52 2015 +1000

    fix dependency check

commit 20f4ce8b7eaf8d29045117675694be024aa9562a
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jun 17 11:36:11 2015 +1000

    override built-in RESTEasy Jackson provider to NOT use JAXB annotation

commit 5a15bcca4324e03c4a8e9e9a8607cc8a08e74c7d
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jun 16 15:01:46 2015 +1000

    fix integration test

commit f1a74e9950335af483ac4ae54bdd0e5198004601
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jun 11 11:48:47 2015 +1000

    Fix a failing test.

commit efabd4e03c445d5b5a72ead88c2a5e1248cf9b83
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Fri Jun 5 11:03:50 2015 +1000

    Fixes for Resteasy3

    Disble Java EE modules from EAP/Wildfly
    Enable Providers via Seam2
    Adjust Arquillian packaging.

commit 2b08324f1a978c513315be5518e2aee08b911af9
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 29 14:51:58 2015 +1000

    Make enforcer happy

commit f1e89355ca30510a169c2403bc557404d099bdcd
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri May 29 13:08:31 2015 +1000

    Upgrade to RESTEasy 3