TOMEE-2295 ensure this works across all profiles
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/35bb6c71 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/35bb6c71 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/35bb6c71 Branch: refs/heads/tomee-7.1.x Commit: 35bb6c7159b69ef289ee309067b6e7b12365de5a Parents: 955278f Author: Jonathan Gallimore <[email protected]> Authored: Wed Dec 5 16:53:24 2018 +0000 Committer: Otavio Santana <[email protected]> Committed: Mon Dec 17 14:00:00 2018 -0200 ---------------------------------------------------------------------- .../apache/openejb/arquillian/tests/cmp/sample/persistence.xml | 5 +++-- .../org/apache/openejb/arquillian/tests/cmp/sample/web.xml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/35bb6c71/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml index d184dd9..69b8971 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence.xml @@ -18,14 +18,15 @@ --> <persistence xmlns="http://java.sun.com/xml/ns/persistence"; version="1.0"> <persistence-unit name="cmp" transaction-type="JTA"> - <jta-data-source>Default JDBC Database</jta-data-source> - <non-jta-data-source>Default Unmanaged JDBC Database</non-jta-data-source> + <jta-data-source>My DataSource</jta-data-source> + <non-jta-data-source>My Unmanaged DataSource</non-jta-data-source> <mapping-file>META-INF/custom-orm.xml</mapping-file> <class>openejb.org.apache.openejb.arquillian.tests.cmp.sample.Movie</class> <class>openejb.org.apache.openejb.arquillian.tests.cmp.sample.Actor</class> <properties> <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true, Indexes=false, IgnoreErrors=true)"/> <property name="openjpa.Log" value="DefaultLevel=INFO"/> + <property name="eclipselink.ddl-generation" value="create-tables"/> </properties> </persistence-unit> </persistence> http://git-wip-us.apache.org/repos/asf/tomee/blob/35bb6c71/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml index cd3c591..68cbacb 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/web.xml @@ -43,5 +43,6 @@ <resource-ref> <res-ref-name>db/DataSource</res-ref-name> <res-type>javax.sql.DataSource</res-type> + <mapped-name>My DataSource</mapped-name> </resource-ref> </web-app> \ No newline at end of file
