geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r951436 - in /geronimo/server/trunk/testsuite/aries-testsuite: ./ jpa/ jpa/jpa-eba/ jpa/jpa-eba/src/ jpa/jpa-eba/src/test/ jpa/jpa-eba/src/test/filtered-resources/ jpa/jpa-eba/src/test/java/ jpa/jpa-eba/src/test/java/org/ jpa/jpa-eba/src/te...
Date Fri, 04 Jun 2010 15:06:22 GMT
Author: gawor
Date: Fri Jun  4 15:06:21 2010
New Revision: 951436

URL: http://svn.apache.org/viewvc?rev=951436&view=rev
Log:
GERONIMO-5205: A test case for testing runtime JPA entity enhancement for OSGi applications

Added:
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/filtered-resources/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/filtered-resources/datasource.xml   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/testsuite/jpa/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Author.java   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceService.java   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceServiceImpl.java   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Entry.java   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/META-INF/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/META-INF/persistence.xml   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/OSGI-INF/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/OSGI-INF/blueprint/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/OSGI-INF/blueprint/blueprint.xml   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/test/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/test/jpa/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/test/jpa/web/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/test/jpa/web/BlogServlet.java   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/WEB-INF/
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/WEB-INF/web.xml   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/index.html   (with props)
    geronimo/server/trunk/testsuite/aries-testsuite/jpa/pom.xml   (with props)
Modified:
    geronimo/server/trunk/testsuite/aries-testsuite/pom.xml
    geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml Fri Jun  4 15:06:21 2010
@@ -0,0 +1,166 @@
+<?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$ -->
+
+<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</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jpa-eba</artifactId>
+    <name>Geronimo TestSuite :: Aries Testsuite :: JPA EBA</name>
+    <packaging>eba</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsuite</groupId>
+            <artifactId>jpa-pu</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.testsuite</groupId>
+            <artifactId>jpa-wab</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>eba-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <generateManifest>true</generateManifest>
+                    <instructions>
+                        <Application-Version>1.0.0</Application-Version>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-failsafe-plugin</artifactId>
+                            <configuration>
+                                <systemPropertyVariables>
+                                    <webAppName>jpa</webAppName>
+                                </systemPropertyVariables>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.tranql</groupId>
+                                            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                                            <version>1.6</version>
+                                            <type>rar</type>
+                                            <outputDirectory>target/</outputDirectory>
+                                            <destFileName>derby.rar</destFileName>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-rar</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/derby.rar</moduleArchive>
+                                    <modulePlan>${project.build.directory}/test-classes/datasource.xml</modulePlan>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>deploy-eba</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.eba</moduleArchive>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy-eba</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>application/${project.groupId}.${project.artifactId}/1.0.0/eba</moduleId>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy-rar</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${project.groupId}/jpa-datasource/1.0.0/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    
+</project>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/filtered-resources/datasource.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/filtered-resources/datasource.xml?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/filtered-resources/datasource.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/filtered-resources/datasource.xml Fri Jun  4 15:06:21 2010
@@ -0,0 +1,75 @@
+<?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$ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <dep:moduleId>
+            <dep:groupId>${project.groupId}</dep:groupId>
+            <dep:artifactId>jpa-datasource</dep:artifactId>
+            <dep:version>1.0.0</dep:version>
+            <dep:type>car</dep:type>
+        </dep:moduleId>
+    </dep:environment>
+
+    <resourceadapter>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+
+                <connectiondefinition-instance>
+                    <name>jdbc/blogdb</name>
+                    <jndi-name>jdbc/blogdb</jndi-name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">blogDB</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <single-pool>
+                            <max-size>100</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <name>jdbc/blogdbnojta</name>
+                    <jndi-name>jdbc/blogdbnojta</jndi-name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">blogDB</config-property-setting>
+                    <config-property-setting name="CreateDatabase">true</config-property-setting>
+                    <connectionmanager>
+                        <no-transaction/>
+                        <single-pool>
+                            <max-size>100</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <select-one-assume-match/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+
+</connector>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/filtered-resources/datasource.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/filtered-resources/datasource.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/filtered-resources/datasource.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/filtered-resources/datasource.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java Fri Jun  4 15:06:21 2010
@@ -0,0 +1,69 @@
+/**
+ *  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 java.io.IOException;
+import java.net.URL;
+
+import org.apache.geronimo.testsupport.HttpUtils;
+import org.apache.geronimo.testsupport.TestSupport;
+import org.testng.annotations.Test;
+
+public class JPATest extends TestSupport {
+
+    private String baseURL = "http://localhost:8080/";
+
+    @Test
+    public void testServlet() throws Exception {
+        checkReply("/BlogServlet");
+    }
+
+
+    private void checkReply(String address)
+        throws Exception {
+        String warName = System.getProperty("webAppName");
+        assertNotNull(warName);
+        URL url = new URL(baseURL + warName + address);
+        /**
+         * WABs are deployed asynchronously so it might take a
+         * bit to actually invoke the servlet.
+         */
+        String reply = doGET(url, 6, 10 * 1000);
+        assertTrue("WAB", 
+                   reply.contains("Blog entry successfully created: JDoe"));
+    }
+  
+    private String doGET(URL url, int repeat, long delay) {
+        for (int i = 0; i < repeat; i++) {
+            try {
+                return HttpUtils.doGET(url); 
+            } catch (IOException e) {
+                // ignore
+                try {
+                    Thread.sleep(delay);
+                } catch (Exception ee) {
+                    break;
+                }
+            }
+        }
+        fail("Did not get servlet response in time");
+        return "";
+    }
+        
+}

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-eba/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml Fri Jun  4 15:06:21 2010
@@ -0,0 +1,59 @@
+<?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$ -->
+
+<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</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jpa-pu</artifactId>
+    <name>Geronimo TestSuite :: Aries Testsuite :: JPA PU</name>
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Author.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Author.java?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Author.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Author.java Fri Jun  4 15:06:21 2010
@@ -0,0 +1,140 @@
+/**
+ * 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.test.jpa.entity;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Table;
+
+/**
+ * This class represents a blog post Author
+ */
+
+@Entity(name = "AUTHOR")
+@Table(name = "AUTHOR")
+public class Author 
+{
+  /** The author's email address */
+  @Id
+  @Column(nullable = false)
+  private String email;
+  
+  /** The author's full name */
+  private String name;
+  /** The display name for this author */
+  private String displayName;
+  /** A short bio for this author */
+  private String bio;  
+  /** The Author's date of birth */
+  private Date dob;
+
+  /** The blog entries posted by this user */
+  @OneToMany(cascade = {CascadeType.REMOVE}, fetch = FetchType.EAGER)
+  @OrderBy("publishDate DESC")
+  private List<Entry> posts;
+
+  /** Get the author's email address */
+  public String getEmail()
+  {
+    return email;
+  }
+
+  /** Get the author's full name */
+  public String getName()
+  {
+    return name;
+  } 
+  
+  /** Get the author's displayed name */
+  public String getDisplayName()
+  {
+    return displayName;
+  }
+
+  /** Get the author's biographical information */
+  public String getBio()
+  {
+    return bio;
+  }
+
+  /** Get the author's date of birth */
+  public Date getDob()
+  {
+    return dob;
+  } 
+
+  /** Get the author's blog posts */
+  public List<Entry> getEntries()
+  {
+    return posts;
+  }
+  
+  // Set methods are not defined in the interface
+  
+  /** Set the author's email address */
+  public void setEmail(String email)
+  {
+    this.email = email;
+  }
+  
+  /** Set the author's full name */
+  public void setName(String name)
+  {
+    this.name = name;
+  }
+  
+  /** Set the author's displayed name */
+  public void setDisplayName(String displayName)
+  {
+    this.displayName = displayName;
+  }
+  
+  /** Set the author's biographical information */
+  public void setBio(String bio)
+  {
+    this.bio = bio;
+  }
+  
+  /** Set the author's date of birth */
+  public void setDob(Date dob)
+  {
+    this.dob = dob;
+  }
+
+  /** Update  the author's blog posts */
+  public void updateEntries(Entry b)
+  {
+    this.posts.add(b);
+  }
+  
+  /** set  the author's blog posts */
+  public void setEntries(List<Entry> lb)
+  {
+    this.posts = lb;
+  }
+  
+}

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Author.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Author.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Author.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceService.java?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceService.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceService.java Fri Jun  4 15:06:21 2010
@@ -0,0 +1,160 @@
+/**
+ * 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.test.jpa.entity;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * This is the interface for the persistence layer of the blog
+ * application.  This persistence layer is registered in the service
+ * registry and is used by the main application layer. 
+ *
+ */
+public interface BlogPersistenceService
+{
+
+  /**
+   * Get all the blog entries in the data store
+   * @return a list of BlogEntry objects
+   */
+  public List<? extends Entry> getAllBlogEntries();
+
+  /**
+   * Get the number of blog entries in the data store
+   * @return the number of blog entries
+   */
+  public int getNoOfBlogEntries();
+
+  /**
+   * Get the first N most recent posts starting from post X
+   * @param firstPostIndex - The index of the first post to be retrieved
+   * @param no - The number of posts to be retrieved starting from firstPostIndex
+   */
+  public List<? extends Entry> getBlogEntries(int firstPostIndex, int no);
+
+  /**
+   * Get all the blog entries made by a particular
+   * author
+   * 
+   * @param emailAddress the author's email address
+   * @return a list of BlogEntry objects
+   */
+  public List<? extends Entry> getBlogsForAuthor(String emailAddress);
+
+  /**
+   * Get a BlogEntry that has a given title
+   * @param title the title of interest
+   * @return A BlogEntry with a specific title (or null if no entry exists in the
+   *         data store)
+   */
+  public Entry findBlogEntryByTitle(String title);
+
+  /**
+   * Get BlogEntries created or modified between two specified dates
+   * @param start  The Date defining the start of the time period
+   * @param end    The Date defining the end of the time period
+   * @return  A list of BlogEntry objects
+   */
+  public List<? extends Entry> getBlogEntriesModifiedBetween(Date start, Date end);
+
+  /**
+   * Obtain a given Blog post using its unique id.
+   * 
+   * @param postId the posts unique id.
+   * @return the Blog post.
+   */
+  public Entry getBlogEntryById(long postId);
+
+  /**
+   * Get the details for an author
+   * @param emailAddress the Author's email address
+   * @return An Author object
+   */
+  public Author getAuthor(String emailAddress);
+
+  /**
+   * Get all authors in the database
+   * @return a List of Authors
+   */
+  public List<? extends Author> getAllAuthors();
+
+  /**
+   * Create an author in the database
+   * 
+   * @param emailAddress
+   * 			The author's email address
+   * @param dob
+   *     		The author's date of birth
+   * @param name
+   *        	The author's name
+   * @param displayName
+   *        	??
+   * @param bio
+   *        	The author's bio.
+   */
+  public void createAuthor(String email, Date dob, String name, String displayName, String bio);
+
+  /**
+   * Create an Blog post in the database
+   * 
+   * @param a
+   * 			The author
+   * @param title
+   * 			The title of the post
+   * @param blogText
+   * 			The text of the post
+   * @param tags
+   * 			??
+   */
+  public void createBlogPost(String email, String title, String blogText, List<String> tags);
+
+  /**
+   * Update an author in the database
+   * @param 
+   */
+  public void updateAuthor(String email, Date dob, String name, String displayName, String bio);
+
+  /**
+   * Update an post in the database
+   * 
+   * @param email The author's email
+   * @param title The title of the post
+   * @param blogText The text of the blog
+   * @param tags The list of tags
+   * @param updatedDate The date the update was made
+   */
+  public void updateBlogEntry(long id, String email, String title, String blogText, List<String> tags, Date updatedDate);
+
+  /**
+   * Remove the author with the specified email address
+   * 
+   * @param emailAddress the email address of the author to remove
+   */
+  public void removeAuthor(String emailAddress);
+
+  /**
+   * Remove the specified BlogEntry, note that this must be a BlogEntry returned by
+   * this service.
+   * 
+   * @param id the unique id of the blog entry to remove
+   */
+  public void removeBlogEntry(long id);
+
+}

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceService.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceServiceImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceServiceImpl.java?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceServiceImpl.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceServiceImpl.java Fri Jun  4 15:06:21 2010
@@ -0,0 +1,194 @@
+/**
+ * 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.test.jpa.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+/**
+ * This class is the implementation of the blogPersistenceService
+ */
+public class BlogPersistenceServiceImpl implements BlogPersistenceService {
+
+    private EntityManager em;
+	
+    public BlogPersistenceServiceImpl() {
+    }
+	
+    //@PersistenceContext(unitName = "blogExample")
+    public void setEntityManager(EntityManager e) {
+        em = e;
+    }
+	
+    public void createAuthor(String email, Date dob, String name,
+                             String displayName, String bio) {
+        Author a = new Author();
+        a.setEmail(email);
+        a.setName(name);
+        a.setDisplayName(displayName);
+        a.setBio(bio);
+        a.setDob(dob);
+        em.persist(a);
+    }
+
+    public void createBlogPost(String authorEmail, String title,
+                               String blogText, List<String> tags) {
+	
+        Author a = em.find(Author.class, authorEmail);
+        Entry b = new Entry();
+        
+        Date publishDate = new Date(System.currentTimeMillis());
+        
+        b.setBlogText(blogText);
+        b.setAuthor(a);
+        b.setTitle((title == null) ? "" : title);
+        b.setPublishDate(publishDate);
+        b.setTags((tags == null) ? new ArrayList<String>() : tags);
+        
+        a.updateEntries(b);
+        em.persist(b);		
+        em.merge(b.getAuthor());
+        //Uncomment this line to verify that datasources have been enlisted.
+        //The data base should not contain the blog post even though it has been persisted.
+        //throw new RuntimeException();
+    }
+
+    public Entry findBlogEntryByTitle(String title) {
+        Query q = em
+            .createQuery("SELECT e FROM BLOGENTRY e WHERE e.title = ?1");
+		q.setParameter(1, title);
+		Entry b = (Entry) q.getSingleResult();
+		return b;
+    }
+    
+    public List<Author> getAllAuthors() {
+        @SuppressWarnings("unchecked")
+        List<Author> list = em.createQuery("SELECT a FROM AUTHOR a").getResultList();        
+        return list;
+    }
+
+    public List<Entry> getAllBlogEntries() {
+        @SuppressWarnings("unchecked")
+        List<Entry> list = em.createQuery("SELECT b FROM BLOGENTRY b ORDER BY b.publishDate DESC").getResultList();
+        return list;        
+    }
+    
+    public int getNoOfBlogEntries() {
+        Number n = (Number) em.createQuery(
+                                           "SELECT COUNT(b) FROM BLOGENTRY b").getSingleResult();
+        return n.intValue();
+    }
+    
+    public List<Entry> getBlogEntries(int firstPostIndex, int noOfPosts) {
+        Query q = em
+            .createQuery("SELECT b FROM BLOGENTRY b ORDER BY b.publishDate DESC");
+        q.setFirstResult(firstPostIndex);
+        q.setMaxResults(noOfPosts);
+        
+        @SuppressWarnings("unchecked")
+        List<Entry> list = q.getResultList();
+        
+        return list;
+    }
+    
+    public Author getAuthor(String emailAddress) {
+        Author a = em.find(Author.class, emailAddress);
+        return a;
+    }
+    
+    public List<Entry> getBlogEntriesModifiedBetween(Date start, Date end) {
+        Query q = em
+            .createQuery("SELECT b FROM BLOGENTRY b WHERE (b.updatedDate >= :start AND b.updatedDate <= :end) OR (b.publishDate >= :start AND b.publishDate <= :end) ORDER BY b.publishDate ASC");
+        q.setParameter("start", start);
+        q.setParameter("end", end);
+        
+        @SuppressWarnings("unchecked")
+        List<Entry> list = q.getResultList();
+        
+        return list;
+    }
+	
+    public List<Entry> getBlogsForAuthor(String emailAddress) {
+        
+        List<Entry> list = em.find(Author.class, emailAddress)
+            .getEntries();
+        
+        return list;
+        
+    }
+
+    public void updateAuthor(String email, Date dob, String name,
+                             String displayName, String bio) {
+        Author a = em.find(Author.class, email);
+        a.setEmail(email);
+        a.setName(name);
+        a.setDisplayName(displayName);
+        a.setBio(bio);
+        a.setDob(dob);
+        em.merge(a);
+    }
+	
+    public void updateBlogEntry(long id, String email, String title,
+                                String blogText, List<String> tags, Date updatedDate) {
+        Entry b = em.find(Entry.class, id);
+        b.setTitle(title);
+        b.setBlogText(blogText);
+        b.setTags(tags);
+        b.setUpdatedDate(updatedDate);
+        
+        em.merge(b);
+    }
+    
+    public void removeAuthor(String emailAddress) {
+        em.remove(em.find(Author.class, emailAddress));
+    }
+    
+    public void removeBlogEntry(long id) {
+        Entry b = em.find(Entry.class, id);
+        b = em.merge(b);
+        b.getAuthor().getEntries().remove(b);
+        
+        em.remove(em.merge(b));
+        em.merge(b.getAuthor());
+    }
+
+    public Entry getBlogEntryById(long postId) {
+        Entry b =  em.find(Entry.class, postId);
+        return b;
+    }
+
+    public void setPublishDate (long postId, Date date) {
+        //Added for testing
+        Entry b = em.find(Entry.class, postId);
+        b.setPublishDate(date);	
+        em.merge(b);
+    }
+	
+    public void setUpdatedDate (long postId, Date date) {
+        //Added for testing
+        Entry b = em.find(Entry.class, postId);
+        b.setUpdatedDate(date);	
+        em.merge(b);
+    }
+}

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceServiceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/BlogPersistenceServiceImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Entry.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Entry.java?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Entry.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Entry.java Fri Jun  4 15:06:21 2010
@@ -0,0 +1,154 @@
+/**
+ * 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.test.jpa.entity;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.FetchType;
+import javax.persistence.ManyToOne;
+import javax.persistence.Column;
+
+/**
+ * This class represents a blog entry
+ */
+@Entity(name = "BLOGENTRY")
+@Table(name = "BLOGENTRY")
+public class Entry
+{
+  /** An auto-generated primary key */
+  @Id
+  @GeneratedValue
+  private Long id;
+
+  /** The author of the blog post */
+  @ManyToOne(fetch=FetchType.EAGER)
+  private Author author;
+
+  /** The date the post was published */
+  private Date publishDate;
+  /** The date the post was last updated */
+  private Date updatedDate;
+  /** The title of the post */
+  private String title;
+  /** Tags associated with the post */
+  private List<String> tags;
+  /** The text of the blog */
+	@Column(length=10000)
+  private String blogText;
+
+  /** Get the author of this blog post */
+  public Author getAuthor()
+  {
+    return author;
+  }
+
+  /** Set the author of this blog post */
+  public void setAuthor(Author author)
+  {
+    this.author = author;
+  }
+
+  /** Get the publish date of this blog post */
+  public Date getPublishDate()
+  {
+    return publishDate;
+  }
+
+  /** Set the publish date of this blog post */
+  public void setPublishDate(Date publishDate)
+  {
+    this.publishDate = publishDate;
+  }
+
+  /** Get the title of this blog post */
+  public String getTitle()
+  {
+    return title;
+  }
+
+  /** Set the title of this blog post */ 
+  public void setTitle(String title)
+  {
+    this.title = title;
+  }
+
+
+  /** Get the tags for this blog post */
+  public List<String> getTags()
+  {
+    return tags;
+  }
+
+  /** Set the tags for this blog post */
+  public void setTags(List<String> tags)
+  {
+    this.tags = tags;
+  }
+
+  /** Get the text for this blog post */
+  public String getBlogText()
+  {
+    return blogText;
+  }
+
+  /** Set the text for this blog post */
+  public void setBlogText(String blogText)
+  {
+    this.blogText = blogText;
+  }
+
+  /** get the Blog post id */
+  public long getId()
+  {
+    return id;
+  }
+
+  /** Set the id */
+  public void setId(Long id)
+  {
+    this.id = id;
+  }
+
+  /**
+   * @return The date of the last update to this blog
+   *         or null if it has never been modified
+   */
+  public Date getUpdatedDate()
+  {
+    return updatedDate;
+  }
+
+  /**
+   * Set the date that the blog post was last updated
+   * 
+   * @param updatedDate
+   */
+  public void setUpdatedDate(Date updatedDate)
+  {
+    this.updatedDate = updatedDate;
+  }
+
+
+}
+

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Entry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Entry.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/java/org/apache/geronimo/test/jpa/entity/Entry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/META-INF/persistence.xml?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/META-INF/persistence.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/META-INF/persistence.xml Fri Jun  4 15:06:21 2010
@@ -0,0 +1,46 @@
+<!--
+    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 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_1_0.xsd"
+   version="1.0">
+
+    <persistence-unit name="blogExample" transaction-type="JTA">
+        <description>Persistence unit for the example blogging application</description>
+
+        <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+
+        <jta-data-source>osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/blogdb)</jta-data-source>
+        <non-jta-data-source>osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/blogdbnojta)</non-jta-data-source>
+
+        <class>org.apache.geronimo.test.jpa.entity.Author</class>
+        <class>org.apache.geronimo.test.jpa.entity.Entry</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+
+        <properties>
+            <!--
+                These properties are creating the database on the fly. We are using them to avoid
+                users having to create a database to run the sample. This is not something that
+                should be used in production. See also the create=true line in the blog-datasource
+                blueprint meta data
+            -->
+            <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)" />
+            <property name="openjpa.jdbc.DBDictionary" value="derby" />
+        </properties>
+
+    </persistence-unit>
+</persistence>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/OSGI-INF/blueprint/blueprint.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/OSGI-INF/blueprint/blueprint.xml Fri Jun  4 15:06:21 2010
@@ -0,0 +1,35 @@
+<?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.
+	-->
+
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:tx="http://aries.apache.org/xmlns/transactions/v1.0.0"
+	xmlns:jpa="http://aries.apache.org/xmlns/jpa/v1.0.0"
+	default-activation="lazy">
+
+    <bean id="persistenceImpl" class="org.apache.geronimo.test.jpa.entity.BlogPersistenceServiceImpl">
+        <tx:transaction method="*" value="Required" />
+        <jpa:context property="entityManager" unitname="blogExample" />
+    </bean>
+
+    <service ref="persistenceImpl" interface="org.apache.geronimo.test.jpa.entity.BlogPersistenceService">
+        <service-properties>
+            <entry key="osgi.jndi.service.name" value="BlogService"/>
+        </service-properties>
+    </service>
+
+</blueprint>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/OSGI-INF/blueprint/blueprint.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/OSGI-INF/blueprint/blueprint.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-pu/src/main/resources/OSGI-INF/blueprint/blueprint.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml Fri Jun  4 15:06:21 2010
@@ -0,0 +1,69 @@
+<?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$ -->
+
+<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</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jpa-wab</artifactId>
+    <name>Geronimo TestSuite :: Aries Testsuite :: JPA WAB</name>
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsuite</groupId>
+            <artifactId>jpa-pu</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Web-ContextPath>/jpa</Web-ContextPath>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Private-Package>org.apache.geronimo.test.jpa.web</Private-Package>
+                        <Export-Package>!org.apache.geronimo.test.jpa.web</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/test/jpa/web/BlogServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/test/jpa/web/BlogServlet.java?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/test/jpa/web/BlogServlet.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/test/jpa/web/BlogServlet.java Fri Jun  4 15:06:21 2010
@@ -0,0 +1,62 @@
+/**
+ *  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.test.jpa.web;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.geronimo.test.jpa.entity.Author;
+import org.apache.geronimo.test.jpa.entity.BlogPersistenceService;
+
+public class BlogServlet extends HttpServlet {
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doPost(request,response);
+    }
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        BlogPersistenceService service = getBlogPersistenceService();
+        
+        service.createAuthor("john@gmail.com", new Date(), "John Doe", "JDoe", "Test Name");
+        service.createBlogPost("john@gmail.com", "First Blog Entry", "Hello. This is my first blog entry", null);
+        
+        Author author = service.getAuthor("john@gmail.com");
+        
+        PrintWriter out = response.getWriter();
+        out.println("<html><head><title>OSGi JPA Test Application</title></head></html>");
+        out.println("<body><h1>");
+        out.println("Blog entry successfully created: " + author.getDisplayName());
+        out.println("</h1></body></html>");
+    }
+    
+    private BlogPersistenceService getBlogPersistenceService() throws ServletException {
+        try {
+            InitialContext ctx = new InitialContext();
+            return (BlogPersistenceService) ctx.lookup("osgi:service/BlogService");
+        } catch (NamingException e) {
+            throw new ServletException("Unable to obtain BlogService", e);
+        }
+    }
+}

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/test/jpa/web/BlogServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/test/jpa/web/BlogServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/java/org/apache/geronimo/test/jpa/web/BlogServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/WEB-INF/web.xml?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/WEB-INF/web.xml Fri Jun  4 15:06:21 2010
@@ -0,0 +1,41 @@
+<?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.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5"
+	metadata-complete="true">
+
+	<display-name>BlogServlet</display-name>
+
+	<servlet>
+		<description></description>
+		<display-name>BlogServlet</display-name>
+		<servlet-name>BlogServlet</servlet-name>
+		<servlet-class>org.apache.geronimo.test.jpa.web.BlogServlet</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>BlogServlet</servlet-name>
+		<url-pattern>/BlogServlet</url-pattern>
+		<url-pattern>/BlogServlet/*</url-pattern>
+	</servlet-mapping>
+
+	<welcome-file-list>
+		<welcome-file>index.html</welcome-file>
+		<welcome-file>index.htm</welcome-file>
+		<welcome-file>index.jsp</welcome-file>
+	</welcome-file-list>
+</web-app>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/index.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/index.html?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/index.html (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/index.html Fri Jun  4 15:06:21 2010
@@ -0,0 +1,19 @@
+<!--
+   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.
+-->
+<ul>
+<li><a href="BlogServlet">blog</a>
+</ul>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/index.html
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/jpa-wab/src/main/resources/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/aries-testsuite/jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/jpa/pom.xml?rev=951436&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/jpa/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/jpa/pom.xml Fri Jun  4 15:06:21 2010
@@ -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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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>aries-testsuite</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>jpa</artifactId>
+    <name>Geronimo TestSuite :: Aries Testsuite :: JPA Test</name>
+    <packaging>pom</packaging>
+    
+    <modules>
+        <module>jpa-pu</module>
+        <module>jpa-wab</module>
+        <module>jpa-eba</module>
+    </modules>
+
+</project>

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/aries-testsuite/jpa/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/testsuite/aries-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/pom.xml?rev=951436&r1=951435&r2=951436&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/aries-testsuite/pom.xml Fri Jun  4 15:06:21 2010
@@ -40,6 +40,7 @@
 
     <modules>
         <module>simple</module>
+        <module>jpa</module>
     </modules>
 
     <build>

Modified: geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml?rev=951436&r1=951435&r2=951436&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml (original)
+++ geronimo/server/trunk/testsuite/aries-testsuite/simple/simple-eba/pom.xml Fri Jun  4 15:06:21 2010
@@ -55,6 +55,9 @@
                 <extensions>true</extensions>
                 <configuration>
                     <generateManifest>true</generateManifest>
+                    <instructions>
+                        <Application-Version>1.0.0</Application-Version>
+                    </instructions>
                 </configuration>
             </plugin>
         </plugins>
@@ -70,12 +73,9 @@
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-failsafe-plugin</artifactId>
                             <configuration>
-                                <systemProperties>
-                                    <property>
-                                        <name>webAppName</name>
-                                        <value>simple</value>
-                                    </property>
-                                </systemProperties>
+                                <systemPropertyVariables>
+                                    <webAppName>simple</webAppName>
+                                </systemPropertyVariables>
                             </configuration>
                         </plugin>
                     </plugins>
@@ -87,7 +87,7 @@
                         <artifactId>geronimo-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>deploy-ears</id>
+                                <id>deploy-eba</id>
                                 <phase>pre-integration-test</phase>
                                 <goals>
                                     <goal>deploy-module</goal>
@@ -97,13 +97,13 @@
                                 </configuration>
                             </execution>
                             <execution>
-                                <id>undeploy-ear-as-moduleId</id>
+                                <id>undeploy-eba</id>
                                 <phase>post-integration-test</phase>
                                 <goals>
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>application/${project.artifactId}/1.0.0/eba</moduleId>
+                                    <moduleId>application/${project.groupId}.${project.artifactId}/1.0.0/eba</moduleId>
                                 </configuration>
                             </execution>
                         </executions>



Mime
View raw message