[zanata/zanata-server] b13362: Squashed commit of the following:
GitHub
noreply at github.com
Thu May 14 06:30:06 UTC 2015
Branch: refs/heads/integration/master
Home: https://github.com/zanata/zanata-server
Commit: b133621822e3e9678f8f606f0429a24762133e66
https://github.com/zanata/zanata-server/commit/b133621822e3e9678f8f606f0429a24762133e66
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-14 (Thu, 14 May 2015)
Changed paths:
M functional-test/pom.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M pom.xml
M zanata-war/src/etc/h2.properties
M zanata-war/src/etc/mysql.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
M zanata-war/src/test/java/org/zanata/ArquillianTest.java
M zanata-war/src/test/java/org/zanata/RestTest.java
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/components.properties
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Squashed commit of the following:
commit d46ede1cd661e9e4531ae6e2b3cc7ed7d7943ca3
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Thu May 14 15:10:29 2015 +1000
Remove persistence-unit-name from components.properties
commit e2e00ff455b106beda5c540ed2c31224d52c44a0
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Thu May 14 14:11:30 2015 +1000
Update to WildFly 9.0.0.CR1 again
- Add jboss-web.xml to Arquillian deployments to ensure JNDI resources
are initialised.
- Rename zanataTestDatasource to zanataDatasource to match jboss-web.xml.
- Rename zanataTestDatasourcePU to zanataDatasourcePU
- Remove ds.jndi.name property.
More information about the zanata-commits
mailing list