You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/08/29 09:52:39 UTC
tomee git commit: enhancing jpa entities for embedded tests
Repository: tomee
Updated Branches:
refs/heads/master 8514d47c5 -> 7257f1cc0
enhancing jpa entities for embedded tests
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7257f1cc
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7257f1cc
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7257f1cc
Branch: refs/heads/master
Commit: 7257f1cc0a4fb18bd2f47929bc30c0adbaa3c727
Parents: 8514d47
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Mon Aug 29 11:52:31 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Mon Aug 29 11:52:31 2016 +0200
----------------------------------------------------------------------
.../arquillian-tomee-webprofile-tests/pom.xml | 18 ++++
.../datasourcerealm/DataSourceRealmTest.java | 96 ++++++++++----------
.../resources/META-INF/build-persistence.xml | 30 ++++++
.../src/test/resources/arquillian.xml | 1 +
arquillian/arquillian-tomee-tests/pom.xml | 5 +-
5 files changed, 98 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7257f1cc/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
index efcc3f0..ed388ac 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
@@ -46,6 +46,24 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>2.4.0</version>
+ <configuration>
+ <includes>org/apache/openejb/arquillian/tests/datasourcerealm/*.class</includes>
+ <persistenceXmlFile>src/test/resources/META-INF/build-persistence.xml</persistenceXmlFile>
+ </configuration>
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>test-enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/tomee/blob/7257f1cc/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/datasourcerealm/DataSourceRealmTest.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/datasourcerealm/DataSourceRealmTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/datasourcerealm/DataSourceRealmTest.java
index 5b04296..578be66 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/datasourcerealm/DataSourceRealmTest.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/datasourcerealm/DataSourceRealmTest.java
@@ -47,66 +47,66 @@ public class DataSourceRealmTest {
.addClasses(AddUser.class, User.class, Role.class, RoleId.class)
.addAsWebInfResource(new StringAsset( // JPA for user/role provisioning and table init
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<persistence xmlns=\"http://java.sun.com/xml/ns/persistence\"\n" +
- " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
- " xsi:schemaLocation=\"\n" +
- " http://java.sun.com/xml/ns/persistence\n" +
- " http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd\"\n" +
- " version=\"2.0\">\n" +
- " <persistence-unit name=\"users\">\n" +
- " <jta-data-source>jdbc/users-managed</jta-data-source>\n" +
- " <non-jta-data-source>jdbc/users</non-jta-data-source>\n" +
- " <class>org.apache.openejb.arquillian.tests.datasourcerealm.User</class>\n" +
- " <class>org.apache.openejb.arquillian.tests.datasourcerealm.Role</class>\n" +
- " <class>org.apache.openejb.arquillian.tests.datasourcerealm.RoleId</class>\n" +
- " <exclude-unlisted-classes>true</exclude-unlisted-classes>\n" +
- " <properties>\n" +
- " <property name=\"openejb.jpa.init-entitymanager\" value=\"true\" />\n" +
- " <property name=\"openjpa.jdbc.SynchronizeMappings\" value=\"buildSchema(ForeignKeys=true)\"/>\n" +
- " <property name=\"openjpa.RuntimeUnenhancedClasses\" value=\"supported\"/>\n" +
- " </properties>\n" +
- " </persistence-unit>\n" +
- "</persistence>"), "persistence.xml")
+ "<persistence xmlns=\"http://java.sun.com/xml/ns/persistence\"\n" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xsi:schemaLocation=\"\n" +
+ " http://java.sun.com/xml/ns/persistence\n" +
+ " http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd\"\n" +
+ " version=\"2.0\">\n" +
+ " <persistence-unit name=\"users\">\n" +
+ " <jta-data-source>jdbc/users-managed</jta-data-source>\n" +
+ " <non-jta-data-source>jdbc/users</non-jta-data-source>\n" +
+ " <class>org.apache.openejb.arquillian.tests.datasourcerealm.User</class>\n" +
+ " <class>org.apache.openejb.arquillian.tests.datasourcerealm.Role</class>\n" +
+ " <class>org.apache.openejb.arquillian.tests.datasourcerealm.RoleId</class>\n" +
+ " <exclude-unlisted-classes>true</exclude-unlisted-classes>\n" +
+ " <properties>\n" +
+ " <property name=\"openejb.jpa.init-entitymanager\" value=\"true\" />\n" +
+ " <property name=\"openjpa.jdbc.SynchronizeMappings\" value=\"buildSchema(ForeignKeys=true)\"/>\n" +
+ " <property name=\"openjpa.RuntimeUnenhancedClasses\" value=\"supported\"/>\n" +
+ " </properties>\n" +
+ " </persistence-unit>\n" +
+ "</persistence>"), "persistence.xml")
.addAsManifestResource(new StringAsset(
"<Context>\n" +
- " <Realm className=\"org.apache.catalina.realm.DataSourceRealm\" \n" +
- " dataSourceName=\"jdbc/users\" localDataSource=\"true\"\n" +
- " userTable=\"users\" userNameCol=\"user_name\" userCredCol=\"user_pass\"\n" +
- " userRoleTable=\"user_roles\" roleNameCol=\"user_role\">\n" +
- "\n" +
- " <CredentialHandler className=\"org.apache.catalina.realm.MessageDigestCredentialHandler\" algorithm=\"md5\" />\n" +
- " </Realm>\n" +
- "</Context>"), "context.xml")
+ " <Realm className=\"org.apache.catalina.realm.DataSourceRealm\" \n" +
+ " dataSourceName=\"jdbc/users\" localDataSource=\"true\"\n" +
+ " userTable=\"users\" userNameCol=\"user_name\" userCredCol=\"user_pass\"\n" +
+ " userRoleTable=\"user_roles\" roleNameCol=\"user_role\">\n" +
+ "\n" +
+ " <CredentialHandler className=\"org.apache.catalina.realm.MessageDigestCredentialHandler\" algorithm=\"md5\" />\n" +
+ " </Realm>\n" +
+ "</Context>"), "context.xml")
.addAsWebInfResource(new StringAsset(
"<Resources>\n" +
- " <Resource id=\"jdbc/users-managed\" type=\"DataSource\">\n" +
- " JtaManaged = true\n" +
- " JdbcUrl = jdbc:hsqldb:mem:DataSourceRealmTest_users\n" +
- " LogSql = true\n" +
- " </Resource>\n" +
- " <Resource id=\"jdbc/users\" type=\"DataSource\">\n" +
- " JtaManaged = false\n" +
- " JdbcUrl = jdbc:hsqldb:mem:DataSourceRealmTest_users\n" +
- " LogSql = true\n" +
- " </Resource>\n" +
- "</Resources>"), "resources.xml")
+ " <Resource id=\"jdbc/users-managed\" type=\"DataSource\">\n" +
+ " JtaManaged = true\n" +
+ " JdbcUrl = jdbc:hsqldb:mem:DataSourceRealmTest_users\n" +
+ " LogSql = true\n" +
+ " </Resource>\n" +
+ " <Resource id=\"jdbc/users\" type=\"DataSource\">\n" +
+ " JtaManaged = false\n" +
+ " JdbcUrl = jdbc:hsqldb:mem:DataSourceRealmTest_users\n" +
+ " LogSql = true\n" +
+ " </Resource>\n" +
+ "</Resources>"), "resources.xml")
.addAsWebResource(new StringAsset("touched"), "index.html")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.setWebXML(new StringAsset(
Descriptors.create(WebAppDescriptor.class)
.getOrCreateSecurityConstraint()
- .createWebResourceCollection()
- .webResourceName("all")
- .urlPattern("/*")
- .up()
- .getOrCreateAuthConstraint()
- .roleName("arquillian")
- .up()
+ .createWebResourceCollection()
+ .webResourceName("all")
+ .urlPattern("/*")
+ .up()
+ .getOrCreateAuthConstraint()
+ .roleName("arquillian")
+ .up()
.up()
.getOrCreateLoginConfig()
- .authMethod("BASIC")
+ .authMethod("BASIC")
.up()
- .exportAsString()));
+ .exportAsString()));
}
@ArquillianResource
http://git-wip-us.apache.org/repos/asf/tomee/blob/7257f1cc/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/META-INF/build-persistence.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/META-INF/build-persistence.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/META-INF/build-persistence.xml
new file mode 100644
index 0000000..b6e89d0
--- /dev/null
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/META-INF/build-persistence.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<persistence version="2.0"
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+ http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ <persistence-unit name="fake-for-embedded-enhancement">
+ <class>org.apache.openejb.arquillian.tests.datasourcerealm.User</class>
+ <class>org.apache.openejb.arquillian.tests.datasourcerealm.Role</class>
+ <class>org.apache.openejb.arquillian.tests.datasourcerealm.RoleId</class>
+ <exclude-unlisted-classes>true</exclude-unlisted-classes>
+ </persistence-unit>
+</persistence>
http://git-wip-us.apache.org/repos/asf/tomee/blob/7257f1cc/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
index 5a3dc6d..b80f45d 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
@@ -30,6 +30,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests
+ openejb.classloader.forced-skip=org.apache.openejb.arquillian.tests.datasourcerealm.User,org.apache.openejb.arquillian.tests.datasourcerealm.Role,org.apache.openejb.arquillian.tests.datasourcerealm.RoleId
openejb.ear.use-as-webcontext-base=true
embedded = true
http://git-wip-us.apache.org/repos/asf/tomee/blob/7257f1cc/arquillian/arquillian-tomee-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index 300b53d..e8a1ae3 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -276,10 +276,7 @@
</goals>
<configuration>
<skip>${skip.embedded}</skip>
- <argLine>
- -javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar
- -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=768M
- </argLine>
+ <argLine>-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=768M</argLine>
<systemPropertyVariables>
<tomee.version>${project.version}</tomee.version>
<arquillian.launch>tomee-embedded</arquillian.launch>