You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pr...@apache.org on 2006/12/15 19:51:34 UTC
svn commit: r487618 - in
/geronimo/server/trunk/testsuite/enterprise-testsuite: ./
ejbcontainer-tests/ jms-tests/ jpa-tests/ jpa-tests/jpa-ear/
jpa-tests/jpa-ear/src/ jpa-tests/jpa-ear/src/main/
jpa-tests/jpa-ear/src/main/resources/ jpa-tests/jpa-ear/s...
Author: prasad
Date: Fri Dec 15 10:51:30 2006
New Revision: 487618
URL: http://svn.apache.org/viewvc?view=rev&rev=487618
Log:
* Adding jpa-tests
Added:
geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/
- copied from r487448, geronimo/server/trunk/testsuite/enterprise-testsuite/test-ejbcontainer/
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/
- copied from r487448, geronimo/server/trunk/testsuite/enterprise-testsuite/test-jms/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/main/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/main/resources/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/main/resources/META-INF/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/main/resources/META-INF/geronimo-application.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/resources/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/resources/testng.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSession.java (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/jpa/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/jpa/AllFieldTypes.java (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/ejb-jar.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/persistence.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/apache/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/apache/geronimo/itest/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/apache/geronimo/itest/TestServlet.java (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/webapp/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/webapp/WEB-INF/
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/webapp/WEB-INF/web.xml (with props)
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml (with props)
Removed:
geronimo/server/trunk/testsuite/enterprise-testsuite/test-ejbcontainer/
geronimo/server/trunk/testsuite/enterprise-testsuite/test-jms/
Modified:
geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml?view=diff&rev=487618&r1=487448&r2=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/pom.xml Fri Dec 15 10:51:30 2006
@@ -31,8 +31,8 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>test-ejbcontainer</artifactId>
- <name>Geronimo TestSuite, EJB Container :: Test ejb modules</name>
+ <artifactId>ejbcontainer-tests</artifactId>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Container Tests</name>
<packaging>jar</packaging>
<description>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml?view=diff&rev=487618&r1=487448&r2=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/pom.xml Fri Dec 15 10:51:30 2006
@@ -31,8 +31,8 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>test-jms</artifactId>
- <name>Geronimo TestSuite, Enterprise :: Test JMS</name>
+ <artifactId>jms-tests</artifactId>
+ <name>Geronimo TestSuite :: Enterprise :: JMS Tests</name>
<packaging>jar</packaging>
<description>
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml Fri Dec 15 10:51:30 2006
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>jpa-tests</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>jpa-ear</artifactId>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - EAR</name>
+ <packaging>ear</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>jpa-ejb</artifactId>
+ <version>${pom.version}</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>jpa-war</artifactId>
+ <version>${pom.version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>testsuite-maven-plugin</artifactId>
+ <version>${version}</version>
+ <executions>
+ <execution>
+ <id>generate-surefire-xml</id>
+ <phase>install</phase>
+ <goals>
+ <goal>generate-surefire-xml</goal>
+ </goals>
+ <!--
+ Merging the configuration of this plugin with the one it inherits.
+ Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+ This plugin executes twice in Maven 2.0.4 (http://jira.codehaus.org/browse/MNG-2221)
+ Maven.2.0.5 will fix it soon.
+ -->
+ <configuration>
+ <grandParent>true</grandParent>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <displayName>jpa Itest ear</displayName>
+ <description>jpa Itest ear</description>
+ <version>1.4</version>
+ <modules>
+ <webModule>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>jpa-war</artifactId>
+ <contextRoot>/jpa</contextRoot>
+ <bundleFileName>web.war</bundleFileName>
+ </webModule>
+ <ejbModule>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>jpa-ejb</artifactId>
+ <bundleFileName>ejb.jar</bundleFileName>
+ </ejbModule>
+ </modules>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testResources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>org.apache.geronimo.testsuite/jpa-ear/${version}/ear</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+
+
+</project>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/main/resources/META-INF/geronimo-application.xml?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/main/resources/META-INF/geronimo-application.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/main/resources/META-INF/geronimo-application.xml Fri Dec 15 10:51:30 2006
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <moduleId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>${pom.artifactId}</artifactId>
+ <version>${version}</version>
+ <type>ear</type>
+ </moduleId>
+ </environment>
+
+</application>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java Fri Dec 15 10:51:30 2006
@@ -0,0 +1,43 @@
+/**
+ * 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.
+ */
+
+package org.apache.geronimo.testsuite.jpa;
+
+import org.testng.annotations.Test;
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+
+/**
+ * ???
+ *
+ * @version $Rev$ $Date$
+ */
+@Test
+public class JPATest
+ extends SeleniumTestSupport
+{
+ @Test
+ public void testIndexContent() throws Exception {
+ selenium.open("/jpa/servlet");
+ selenium.waitForPageToLoad("30000");
+ //assertEquals("Hello J2EE 1.4", selenium.getTitle());
+ assertEquals("TestServlet\nTest Servlet container managed entity manager test OK: true\nTest Servlet app managed entity manager factory test OK: true", selenium.getText("xpath=/html/body"));
+
+ }
+}
+
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/resources/testng.xml?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/resources/testng.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/resources/testng.xml Fri Dec 15 10:51:30 2006
@@ -0,0 +1,31 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="1">
+ <test name="jpa-testsuite.jpa">
+ <packages>
+ <package name="org.apache.geronimo.testsuite.jpa"/>
+ </packages>
+ </test>
+</suite>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/resources/testng.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/resources/testng.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/resources/testng.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Fri Dec 15 10:51:30 2006
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>jpa-tests</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jpa-ejb</artifactId>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - JAR</name>
+ <packaging>ejb</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>0.9.6-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <path id="enhance.path.ref">
+ <fileset dir="${project.build.outputDirectory}">
+ <include name="**/*.class"/>
+ </fileset>
+ </path>
+ <pathconvert property="enhance.files"
+ refid="enhance.path.ref"
+ pathsep=" "/>
+ <java classname="org.apache.openjpa.enhance.PCEnhancer">
+ <arg line="-p persistence.xml"/>
+ <arg line="${enhance.files}"/>
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <path refid="maven.compile.classpath"/>
+ </classpath>
+ </java>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSession.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSession.java?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSession.java (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSession.java Fri Dec 15 10:51:30 2006
@@ -0,0 +1,27 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+
+package org.apache.geronimo.itest;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface TestSession extends javax.ejb.EJBObject {
+ boolean testEntityManager();
+
+ boolean testEntityManagerFactory();
+}
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSession.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSession.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSession.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java Fri Dec 15 10:51:30 2006
@@ -0,0 +1,85 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+
+package org.apache.geronimo.itest;
+
+import javax.ejb.SessionBean;
+import javax.ejb.EJBException;
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.apache.geronimo.itest.jpa.AllFieldTypes;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class TestSessionBean implements SessionBean {
+
+ SessionContext sessionContext;
+
+ public boolean testEntityManager() {
+ try {
+ EntityManager entityManager = (EntityManager) new InitialContext().lookup("java:comp/env/jpa/test");
+ System.out.println("Accessed entity manager");
+ AllFieldTypes allFieldTypes = new AllFieldTypes();
+ entityManager.persist(allFieldTypes);
+ System.out.println("saved object");
+ return true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.out.println("Could not access entity manager");
+ return false;
+ }
+ }
+
+ public boolean testEntityManagerFactory() {
+ try {
+ EntityManagerFactory entityManagerFactory = (EntityManagerFactory) new InitialContext().lookup("java:comp/env/jpa/testEMF");
+ System.out.println("Accessed entity manager factory");
+ EntityManager entityManager = entityManagerFactory.createEntityManager();
+ AllFieldTypes allFieldTypes = new AllFieldTypes();
+ entityManager.persist(allFieldTypes);
+ System.out.println("saved object");
+ entityManager.close();
+ System.out.println("Closed entity manager");
+ return true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.out.println("Could not access entity manager");
+ return false;
+ }
+ }
+
+ public void ejbCreate() {
+ System.out.println("TestSessionBean");
+ }
+
+ public void ejbActivate() throws EJBException {
+ }
+
+ public void ejbPassivate() throws EJBException {
+ }
+
+ public void ejbRemove() throws EJBException {
+ }
+
+ public void setSessionContext(SessionContext sessionContext) throws EJBException {
+ this.sessionContext = sessionContext;
+ }
+}
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java Fri Dec 15 10:51:30 2006
@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+
+package org.apache.geronimo.itest;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface TestSessionHome extends javax.ejb.EJBHome {
+
+ public TestSession create( ) throws RemoteException, CreateException;
+
+}
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/jpa/AllFieldTypes.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/jpa/AllFieldTypes.java?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/jpa/AllFieldTypes.java (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/jpa/AllFieldTypes.java Fri Dec 15 10:51:30 2006
@@ -0,0 +1,142 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+package org.apache.geronimo.itest.jpa;
+
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import javax.persistence.Entity;
+
+/**
+ * Mr. Bott's Every Field Bean
+ *
+ * Taken from openjpa-persistence-jdbc
+ */
+
+@Entity
+public class AllFieldTypes {
+
+ private short shortField;
+ private int intField;
+ private boolean booleanField;
+ private long longField;
+ private float floatField;
+ private char charField;
+ private double doubleField;
+ private byte byteField;
+ private String stringField;
+ private Date dateField;
+ private Set<String> setOfStrings = new HashSet<String>();
+ private String[] arrayOfStrings;
+
+ public void setShortField(short shortField) {
+ this.shortField = shortField;
+ }
+
+ public short getShortField() {
+ return this.shortField;
+ }
+
+ public void setIntField(int intField) {
+ this.intField = intField;
+ }
+
+ public int getIntField() {
+ return this.intField;
+ }
+
+ public void setBooleanField(boolean booleanField) {
+ this.booleanField = booleanField;
+ }
+
+ public boolean getBooleanField() {
+ return this.booleanField;
+ }
+
+ public void setLongField(long longField) {
+ this.longField = longField;
+ }
+
+ public long getLongField() {
+ return this.longField;
+ }
+
+ public void setFloatField(float floatField) {
+ this.floatField = floatField;
+ }
+
+ public float getFloatField() {
+ return this.floatField;
+ }
+
+ public void setCharField(char charField) {
+ this.charField = charField;
+ }
+
+ public char getCharField() {
+ return this.charField;
+ }
+
+ public void setDoubleField(double doubleField) {
+ this.doubleField = doubleField;
+ }
+
+ public double getDoubleField() {
+ return this.doubleField;
+ }
+
+ public void setByteField(byte byteField) {
+ this.byteField = byteField;
+ }
+
+ public byte getByteField() {
+ return this.byteField;
+ }
+
+ public void setStringField(String stringField) {
+ this.stringField = stringField;
+ }
+
+ public String getStringField() {
+ return this.stringField;
+ }
+
+ public void setDateField(Date dateField) {
+ this.dateField = dateField;
+ }
+
+ public Date getDateField() {
+ return this.dateField;
+ }
+
+ public void setSetOfStrings(Set<String> setOfStrings) {
+ this.setOfStrings = setOfStrings;
+ }
+
+ public Set<String> getSetOfStrings() {
+ return this.setOfStrings;
+ }
+
+ public void setArrayOfStrings(String[] arrayOfStrings) {
+ this.arrayOfStrings = arrayOfStrings;
+ }
+
+ public String[] getArrayOfStrings() {
+ return this.arrayOfStrings;
+ }
+}
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/jpa/AllFieldTypes.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/jpa/AllFieldTypes.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/java/org/apache/geronimo/itest/jpa/AllFieldTypes.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/ejb-jar.xml?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/ejb-jar.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/ejb-jar.xml Fri Dec 15 10:51:30 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+Licensed 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.
+-->
+<ejb-jar version="2.1"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
+ <display-name>jpa itest ejb</display-name>
+ <enterprise-beans>
+ <session>
+ <description>JPA Itest ejb</description>
+ <display-name>TestSession</display-name>
+ <ejb-name>TestSession</ejb-name>
+ <home>org.apache.geronimo.itest.TestSessionHome</home>
+ <remote>org.apache.geronimo.itest.TestSession</remote>
+ <ejb-class>org.apache.geronimo.itest.TestSessionBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml Fri Dec 15 10:51:30 2006
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+Licensed 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.
+-->
+<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+ <environment>
+ <moduleId>
+ <groupId>default</groupId>
+ <artifactId>jpa-ejb</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <type>car</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>system-database</artifactId>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openjpa</artifactId>
+ <type>car</type>
+ </dependency>
+
+ </dependencies>
+ </environment>
+ <enterprise-beans>
+ <session>
+ <ejb-name>TestSession</ejb-name>
+ <persistence-context-ref>
+ <persistence-context-ref-name>jpa/test</persistence-context-ref-name>
+ <persistence-unit-name>test-unit</persistence-unit-name>
+ <persistence-context-type>transaction-scoped</persistence-context-type>
+ </persistence-context-ref>
+ <entity-manager-factory-ref>
+ <entity-manager-factory-ref-name>jpa/testEMF</entity-manager-factory-ref-name>
+ <persistence-unit-name>test-unit</persistence-unit-name>
+ </entity-manager-factory-ref>
+ </session>
+ </enterprise-beans>
+
+ <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+
+ <persistence-unit transaction-type="JTA" name="test-unit">
+
+
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <jta-data-source>?name=SystemDatasource</jta-data-source>
+ <non-jta-data-source>?name=NoTxDatasource</non-jta-data-source>
+ <class>org.apache.geronimo.itest.jpa.AllFieldTypes</class>
+ <exclude-unlisted-classes/>
+ <properties>
+ <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+ <!--<property name="openjpa.Sequence" value="org.apache.openjpa.jdbc.kernel.TableJDBCSeq(Table=OPENJPASEQ, Increment=100)"/>-->
+ </properties>
+ </persistence-unit>
+ </persistence>
+
+
+</openejb-jar>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/persistence.xml?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/persistence.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/persistence.xml Fri Dec 15 10:51:30 2006
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+
+ <persistence-unit transaction-type="RESOURCE_LOCAL" name="openjpa-itest">
+
+
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <class>org.apache.geronimo.itest.jpa.AllFieldTypes</class>
+ <exclude-unlisted-classes/>
+ <properties>
+ <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+ <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
+ </properties>
+ </persistence-unit>
+</persistence>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml Fri Dec 15 10:51:30 2006
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>jpa-tests</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jpa-war</artifactId>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - WAR</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>jpa-ejb</artifactId>
+ <version>${version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-security</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.1</version>
+ <configuration>
+ <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
+ <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+ <archiveClasses>true</archiveClasses>
+ <archive>
+ <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/apache/geronimo/itest/TestServlet.java?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/apache/geronimo/itest/TestServlet.java (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/apache/geronimo/itest/TestServlet.java Fri Dec 15 10:51:30 2006
@@ -0,0 +1,62 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
+
+package org.apache.geronimo.itest;
+
+import java.io.IOException;
+import java.rmi.RemoteException;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.ejb.CreateException;
+
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class TestServlet extends HttpServlet {
+
+ public void init() {
+ System.out.println("Test Servlet init");
+ }
+
+ protected void service(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException {
+ httpServletResponse.getOutputStream().print("TestServlet\n");
+ try {
+ InitialContext ctx = new InitialContext();
+ TestSessionHome home = (TestSessionHome)ctx.lookup("java:comp/env/TestSession");
+ boolean result = home.create().testEntityManager();
+ httpServletResponse.getOutputStream().print("Test Servlet container managed entity manager test OK: " + result);
+ result = home.create().testEntityManagerFactory();
+ httpServletResponse.getOutputStream().print("\nTest Servlet app managed entity manager factory test OK: " + result);
+ } catch (NamingException e) {
+ System.out.print("Exception:");
+ e.printStackTrace();
+ } catch (RemoteException e) {
+ e.printStackTrace();
+ } catch (CreateException e) {
+ e.printStackTrace();
+ }
+ httpServletResponse.flushBuffer();
+ }
+
+
+}
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/webapp/WEB-INF/web.xml?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/webapp/WEB-INF/web.xml Fri Dec 15 10:51:30 2006
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Copyright 2006 The Apache Software Foundation
+Licensed 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.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4"
+ >
+
+ <display-name>Geronimo EJBRef Itest War</display-name>
+
+ <servlet>
+ <display-name>Manifest ClassPath itest servlet</display-name>
+ <servlet-name>servlet</servlet-name>
+ <servlet-class>org.apache.geronimo.itest.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>servlet</servlet-name>
+ <url-pattern>/servlet</url-pattern>
+ </servlet-mapping>
+
+ <ejb-ref>
+ <ejb-ref-name>TestSession</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <home>org.apache.geronimo.itest.TestSessionHome</home>
+ <remote>org.apache.geronimo.itest.TestSession</remote>
+ </ejb-ref>
+
+<!--
+ <security-constraint>
+ <display-name>All</display-name>
+ <web-resource-collection>
+ <web-resource-name>secureServlet</web-resource-name>
+ <url-pattern>/servlet</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <description>All Authenticated</description>
+ <role-name>Authenticated</role-name>
+ <role-name>Everybody</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>TestRealm</realm-name>
+ </login-config>
+ <security-role>
+ <role-name>Authenticated</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Everybody</role-name>
+ </security-role>
+-->
+
+
+</web-app>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml?view=auto&rev=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml (added)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml Fri Dec 15 10:51:30 2006
@@ -0,0 +1,43 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>enterprise-testsuite</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jpa-tests</artifactId>
+ <packaging>pom</packaging>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA Tests</name>
+
+ <profiles>
+ <profile>
+ <id>child</id>
+ <modules>
+ <module>jpa-ejb</module>
+ <module>jpa-war</module>
+ <module>jpa-ear</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml?view=diff&rev=487618&r1=487617&r2=487618
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml Fri Dec 15 10:51:30 2006
@@ -23,7 +23,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>testsuite</artifactId>
@@ -46,7 +46,7 @@
- JPA
- JavaMail
</description>
-
+
<build>
<plugins>
<plugin>
@@ -65,7 +65,7 @@
</plugin>
</plugins>
</build>
-
+
<profiles>
<profile>
<id>default</id>
@@ -78,10 +78,29 @@
-->
<build>
<plugins>
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
+ <plugin>
+ <!--
+ One of the pom that this invokes using m-m-p has packaging set to "pom".
+ That expects it's parent (this pom) to be installed already.
+ So installing it ahead before we invoke it in the integration-test phase
+ -->
+ <artifactId>maven-install-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>install-ahead</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
@@ -95,9 +114,11 @@
</build>
</profile>
+
<profile>
<id>child</id>
</profile>
</profiles>
+
</project>