geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r834639 - in /geronimo/plugins/openjpa2/branches/2.2: ./ geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/ geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/ jpa-tests/ jpa-tests/jpa-ear/ jpa-t...
Date Tue, 10 Nov 2009 20:06:09 GMT
Author: dwoods
Date: Tue Nov 10 20:06:08 2009
New Revision: 834639

URL: http://svn.apache.org/viewvc?rev=834639&view=rev
Log:
GERONIMO-4946 more build updates and added copy of the jpa-tests from the server builds to
test the plugin

Added:
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/
      - copied from r833700, geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/README.txt   (with props)
Removed:
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/goals.txt
Modified:
    geronimo/plugins/openjpa2/branches/2.2/README.txt
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/src/main/history/dependencies.xml
    geronimo/plugins/openjpa2/branches/2.2/pom.xml

Modified: geronimo/plugins/openjpa2/branches/2.2/README.txt
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/README.txt?rev=834639&r1=834638&r2=834639&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/README.txt (original)
+++ geronimo/plugins/openjpa2/branches/2.2/README.txt Tue Nov 10 20:06:08 2009
@@ -45,6 +45,19 @@
     b) Press Install
     c) On the confirmation panel, press Install
     d) Once the plugins are installed, press Done
+5) Start the JPA Deployer -
+    a) Navigate to Applications -> System Modules
+    b) Select the "Start" link for -
+       org.apache.geronimo.configs/persistence-jpa20-deployer/<version>/car
+6) Restart the OpenEJB Deployer, which has a dependency on OpenJPA -
+    a) Navigate to Applications -> System Modules
+    b) Select the "Start" link for -
+       org.apache.geronimo.configs/openejb-deployer/<version>/car
+
+Note:  If you want to reinstall the OpenJPA2 plugins (say upgrading to a newer
+level or for maintenance udpates) you may need to repeat the Installing steps
+above twice, as sometimes the first installation try will only uninstall the
+existing plugins.
 
 
 Uninstalling -

Modified: geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java?rev=834639&r1=834638&r2=834639&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
Tue Nov 10 20:06:08 2009
@@ -72,6 +72,9 @@
         entityManagerRegistry = null;
     }
 
+    /*
+     * Old JPA 1.0 compatiable constructor
+     */
     public PersistenceUnitGBean(String persistenceUnitName,
             String persistenceProviderClassName,
             String persistenceUnitTransactionTypeString,
@@ -86,10 +89,50 @@
             TransactionManagerImpl transactionManager,
             Collection<ExtendedEntityManagerRegistry > entityManagerRegistry,
             URL configurationBaseURL,
+            ClassLoader classLoader) throws URISyntaxException, MalformedURLException, ResourceException
{
+        this( persistenceUnitName,
+              persistenceProviderClassName,
+              persistenceUnitTransactionTypeString,
+              jtaDataSourceWrapper,
+              nonJtaDataSourceWrapper,
+              mappingFileNamesUntyped,
+              jarFileUrlsUntyped,
+              persistenceUnitRoot,
+              managedClassNames,
+              excludeUnlistedClassesValue,
+              properties,
+              transactionManager,
+              entityManagerRegistry,
+              configurationBaseURL,
+              classLoader,
+              "2.0",
+              SharedCacheMode.NONE,
+              ValidationMode.NONE);
+    }
+
+    /*
+     * New JPA 2.0 constructor with the following new parameters:
+     *     persistenceXMLSchemaVersion,sharedCacheMode validationMode
+     */
+    public PersistenceUnitGBean(String persistenceUnitName,
+            String persistenceProviderClassName,
+            String persistenceUnitTransactionTypeString,
+            ResourceSource<ResourceException> jtaDataSourceWrapper,
+            ResourceSource<ResourceException> nonJtaDataSourceWrapper,
+            List<String> mappingFileNamesUntyped,
+            List<String> jarFileUrlsUntyped,
+            String persistenceUnitRoot,
+            List<String> managedClassNames,
+            boolean excludeUnlistedClassesValue,
+            Properties properties,
+            TransactionManagerImpl transactionManager,
+            Collection<ExtendedEntityManagerRegistry > entityManagerRegistry,
+            URL configurationBaseURL,
+            ClassLoader classLoader,
             String persistenceXMLSchemaVersion,
             SharedCacheMode sharedCacheMode,
-            ValidationMode validationMode,
-            ClassLoader classLoader) throws URISyntaxException, MalformedURLException, ResourceException
{
+            ValidationMode validationMode) throws URISyntaxException, MalformedURLException,
ResourceException {
+
         List<String> mappingFileNames = mappingFileNamesUntyped == null? NO_STRINGS:
new ArrayList<String>(mappingFileNamesUntyped);
         this.persistenceUnitRoot = persistenceUnitRoot;
         URI configurationBaseURI = new File(configurationBaseURL.getFile()).toURI();
@@ -114,6 +157,14 @@
 
         if (persistenceProviderClassName == null) persistenceProviderClassName = "org.apache.openjpa.persistence.PersistenceProviderImpl";
         
+        // JPA2 attributes
+        if (persistenceXMLSchemaVersion == null)
+            persistenceXMLSchemaVersion = "2.0";
+        if (sharedCacheMode == null)
+            sharedCacheMode = SharedCacheMode.NONE;
+        if (validationMode == null)
+            validationMode = ValidationMode.NONE;
+
         persistenceUnitInfo = new PersistenceUnitInfoImpl(persistenceUnitName,
                 persistenceProviderClassName,
                 persistenceUnitTransactionType,
@@ -125,10 +176,10 @@
                 managedClassNames,
                 excludeUnlistedClassesValue,
                 properties,
+                classLoader,
                 persistenceXMLSchemaVersion,
                 sharedCacheMode,
-                validationMode,
-                classLoader);
+                validationMode);
         try {
             Class clazz = classLoader.loadClass(persistenceProviderClassName);
             PersistenceProvider persistenceProvider = (PersistenceProvider) clazz.newInstance();
@@ -236,6 +287,21 @@
         persistenceUnitInfo.destroy();
     }
 
+    /**
+     * JPA2 added methods
+     */
+    public String getPersistenceXMLSchemaVersion() {
+        return persistenceUnitInfo.getPersistenceXMLSchemaVersion();
+    }
+
+    public SharedCacheMode getSharedCacheMode() {
+        return persistenceUnitInfo.getSharedCacheMode();
+    }
+
+    public ValidationMode getValidationMode() {
+        return persistenceUnitInfo.getValidationMode();
+    }
+
     private static class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
         private final String persistenceUnitName;
         private final String persistenceProviderClassName;
@@ -256,12 +322,51 @@
         private final ValidationMode validationMode;
 
 
-        public PersistenceUnitInfoImpl(String persistenceUnitName, String persistenceProviderClassName,
-                PersistenceUnitTransactionType persistenceUnitTransactionType, DataSource
jtaDataSource,
-                DataSource nonJtaDataSource, List<String> mappingFileNames, List<URL>
jarFileUrls,
-                URL persistenceUnitRootUrl, List<String> managedClassNames, boolean
excludeUnlistedClassesValue,
-                Properties properties, String persistenceXMLSchemaVersion, SharedCacheMode
sharedCacheMode,
-                ValidationMode validationMode, ClassLoader classLoader) {
+        public PersistenceUnitInfoImpl(String persistenceUnitName,
+                String persistenceProviderClassName,
+                PersistenceUnitTransactionType persistenceUnitTransactionType,
+                DataSource jtaDataSource,
+                DataSource nonJtaDataSource,
+                List<String> mappingFileNames,
+                List<URL> jarFileUrls,
+                URL persistenceUnitRootUrl,
+                List<String> managedClassNames,
+                boolean excludeUnlistedClassesValue,
+                Properties properties,
+                ClassLoader classLoader) {
+
+            this( persistenceUnitName,
+                  persistenceProviderClassName,
+                  persistenceUnitTransactionType,
+                  jtaDataSource,
+                  nonJtaDataSource,
+                  mappingFileNames,
+                  jarFileUrls,
+                  persistenceUnitRootUrl,
+                  managedClassNames,
+                  excludeUnlistedClassesValue,
+                  properties,
+                  classLoader,
+                  "2.0",
+                  SharedCacheMode.NONE,
+                  ValidationMode.NONE);
+        }
+            
+        public PersistenceUnitInfoImpl(String persistenceUnitName,
+                String persistenceProviderClassName,
+                PersistenceUnitTransactionType persistenceUnitTransactionType,
+                DataSource jtaDataSource,
+                DataSource nonJtaDataSource,
+                List<String> mappingFileNames,
+                List<URL> jarFileUrls,
+                URL persistenceUnitRootUrl,
+                List<String> managedClassNames,
+                boolean excludeUnlistedClassesValue,
+                Properties properties,
+                ClassLoader classLoader,
+                String persistenceXMLSchemaVersion,
+                SharedCacheMode sharedCacheMode,
+                ValidationMode validationMode) {
             
             this.persistenceUnitName = persistenceUnitName;
             this.persistenceProviderClassName = persistenceProviderClassName;
@@ -367,17 +472,14 @@
         /**
          * JPA2 added methods
          */
-        @Override
         public String getPersistenceXMLSchemaVersion() {
             return persistenceXMLSchemaVersion;
         }
 
-        @Override
         public SharedCacheMode getSharedCacheMode() {
             return sharedCacheMode;
         }
 
-        @Override
         public ValidationMode getValidationMode() {
             return validationMode;
         }
@@ -393,21 +495,21 @@
         infoBuilder.addAttribute("persistenceUnitName", String.class, true, true);
         infoBuilder.addAttribute("persistenceProviderClassName", String.class, true, true);
         infoBuilder.addAttribute("persistenceUnitTransactionType", String.class, true, true);
+        infoBuilder.addReference("JtaDataSourceWrapper", ResourceSource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
+        infoBuilder.addReference("NonJtaDataSourceWrapper", ResourceSource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
         infoBuilder.addAttribute("mappingFileNames", List.class, true, true);
         infoBuilder.addAttribute("jarFileUrls", List.class, true, true);
         infoBuilder.addAttribute("persistenceUnitRoot", String.class, true, true);
         infoBuilder.addAttribute("managedClassNames", List.class, true, true);
         infoBuilder.addAttribute("excludeUnlistedClasses", boolean.class, true, true);
         infoBuilder.addAttribute("properties", Properties.class, true, true);
+        infoBuilder.addReference("TransactionManager", TransactionManagerImpl.class, NameFactory.JTA_RESOURCE);
         infoBuilder.addAttribute("configurationBaseUrl", URL.class, true);
-
+        // new JPA2 attributes
         infoBuilder.addAttribute("persistenceXMLSchemaVersion", String.class, true, true);
         infoBuilder.addAttribute("sharedCacheMode", SharedCacheMode.class, true, true);
         infoBuilder.addAttribute("validationMode", ValidationMode.class, true, true);
 
-        infoBuilder.addReference("TransactionManager", TransactionManagerImpl.class, NameFactory.JTA_RESOURCE);
-        infoBuilder.addReference("JtaDataSourceWrapper", ResourceSource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
-        infoBuilder.addReference("NonJtaDataSourceWrapper", ResourceSource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
         infoBuilder.addReference("EntityManagerRegistry", ExtendedEntityManagerRegistry.class,
GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
 
         infoBuilder.setConstructor(new String[] {
@@ -425,10 +527,10 @@
                 "TransactionManager",
                 "EntityManagerRegistry",
                 "configurationBaseUrl",
+                "classLoader",
                 "persistenceXMLSchemaVersion",
                 "sharedCacheMode",
-                "validationMode",
-                "classLoader"
+                "validationMode"
         });
 
         GBEAN_INFO = infoBuilder.getBeanInfo();

Modified: geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java?rev=834639&r1=834638&r2=834639&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
Tue Nov 10 20:06:08 2009
@@ -49,14 +49,46 @@
                 null,
                 null,
                 new File("/foo/bar/Root").toURL(),
-                "2.0",
+                getClass().getClassLoader(),
+                "1.0",
                 SharedCacheMode.NONE,
-                ValidationMode.AUTO,
-                getClass().getClassLoader());
+                ValidationMode.NONE);
+        assertNotNull(gbean.getManagedClassNames());
+        assertNotNull(gbean.getProperties());
+        assertNotNull(gbean.getJarFileUrls());
+        assertNotNull(gbean.getPersistenceUnitRootUrl());
+        assertNotNull(gbean.getPersistenceProviderClassName());
+        assertEquals(gbean.getPersistenceXMLSchemaVersion(), "1.0");
+        assertEquals(gbean.getSharedCacheMode(), SharedCacheMode.NONE);
+        assertEquals(gbean.getValidationMode(), ValidationMode.NONE);
+    }
+    
+    public void testJPA2PU() throws Exception {
+        PersistenceUnitGBean gbean = new PersistenceUnitGBean("foo",
+                null,
+                "JTA",
+                null,
+                null,
+                null,
+                null,
+                "/foo/bar/Root",
+                null,
+                true,
+                null,
+                null,
+                null,
+                new File("/foo/bar/Root").toURL(),
+                getClass().getClassLoader(),
+                "2.0",
+                SharedCacheMode.ALL,
+                ValidationMode.AUTO);
         assertNotNull(gbean.getManagedClassNames());
         assertNotNull(gbean.getProperties());
         assertNotNull(gbean.getJarFileUrls());
         assertNotNull(gbean.getPersistenceUnitRootUrl());
         assertNotNull(gbean.getPersistenceProviderClassName());
+        assertEquals(gbean.getPersistenceXMLSchemaVersion(), "2.0");
+        assertEquals(gbean.getSharedCacheMode(), SharedCacheMode.ALL);
+        assertEquals(gbean.getValidationMode(), ValidationMode.AUTO);
     }
 }

Added: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/README.txt
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/README.txt?rev=834639&view=auto
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/README.txt (added)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/README.txt Tue Nov 10 20:06:08 2009
@@ -0,0 +1,13 @@
+Apache OpenJPA 2.0 Plugin for Apache Geronimo 2.2 Server
+Copyright 2003-2009 The Apache Software Foundation
+--------------------------------------------------------------------------------
+
+This is a copy of the server's testsuite/enterprise-testsuite/jpa-tests code,
+which has been updated to use the updated artifact versions from this plugin.
+
+After building and installing the OpenJPA2 plugin into your server, deploy -
+    jpa-ear/target/jpa-ear-<version>.ear
+
+To access the test once deployed, use a browser to access -
+    http://localhost:8080/jpa/servlet
+

Propchange: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml?rev=834639&r1=833700&r2=834639&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml Tue Nov 10 20:06:08 2009
@@ -25,9 +25,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
+        <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.2-M3-SNAPSHOT</version>
     </parent>
     
     <artifactId>jpa-ear</artifactId>
@@ -40,14 +40,14 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
+            <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
             <artifactId>jpa-ejb</artifactId>
             <version>${version}</version>
             <type>ejb</type>
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
+            <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
             <artifactId>jpa-war</artifactId>
             <version>${version}</version>
             <type>war</type>
@@ -65,13 +65,13 @@
                     <version>1.4</version>
                     <modules>
                         <webModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
+                            <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
                             <artifactId>jpa-war</artifactId>
                             <contextRoot>/jpa</contextRoot>
                             <bundleFileName>web.war</bundleFileName>
                         </webModule>
                         <ejbModule>
-                            <groupId>org.apache.geronimo.testsuite</groupId>
+                            <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
                             <artifactId>jpa-ejb</artifactId>
                             <bundleFileName>ejb.jar</bundleFileName>
                         </ejbModule>
@@ -79,6 +79,7 @@
                 </configuration>
             </plugin>
 
+            <!-- don't include normal testsuite plugin setup
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -88,6 +89,7 @@
                     </suiteXmlFiles>
                 </configuration>
             </plugin>
+            -->
 
             <!-- "ear" packaging doesn't compile test classes -->
             <plugin>
@@ -115,9 +117,11 @@
                 </executions>
             </plugin>
             
+            <!-- don't include normal testsuite plugin setup
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>geronimo-maven-plugin</artifactId>
+                <version>${geronimoVersion}</version>
                 <executions>
                     <execution>
                         <id>deploy</id>
@@ -142,6 +146,7 @@
                     </execution>
                 </executions>
             </plugin>
+            -->
         </plugins>
     </build>
 

Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml?rev=834639&r1=833700&r2=834639&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml Tue Nov 10 20:06:08 2009
@@ -25,19 +25,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
+        <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.2-M3-SNAPSHOT</version>
     </parent>
 
     <artifactId>jpa-ejb</artifactId>
-    <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - JAR</name>
+    <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - EJB JAR</name>
     <packaging>ejb</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <!--<artifactId>geronimo-jpa_1.0_spec</artifactId>-->
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <version>${jpa2specVersion}</version>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml?rev=834639&r1=833700&r2=834639&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml Tue Nov 10 20:06:08 2009
@@ -25,9 +25,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.testsuite</groupId>
+        <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.2-M3-SNAPSHOT</version>
     </parent>
 
     <artifactId>jpa-war</artifactId>
@@ -36,7 +36,7 @@
 
      <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.testsuite</groupId>
+            <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
             <artifactId>jpa-ejb</artifactId>
             <version>${version}</version>
             <optional>true</optional>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml?rev=834639&r1=833700&r2=834639&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml Tue Nov 10 20:06:08 2009
@@ -24,21 +24,70 @@
     
     <modelVersion>4.0.0</modelVersion>
 
+    <!--
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>enterprise-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
+    -->
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openjpa2</artifactId>
+        <version>2.2-M3-SNAPSHOT</version>
+    </parent>
 
+    <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
     <artifactId>jpa-tests</artifactId>
+    <version>2.2-M3-SNAPSHOT</version>
     <packaging>pom</packaging>
     
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA Tests</name>
 
+    <properties>
+        <openjpaVersion>2.0.0-M3</openjpaVersion>
+        <jpa2specVersion>1.0-PFD2</jpa2specVersion>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-selenium</artifactId>
+            <version>${geronimoVersion}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy.maven.support</groupId>
+            <artifactId>slf4j-gossip</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
     <modules>
         <module>jpa-ejb</module>
         <module>jpa-war</module>
         <module>jpa-ear</module>
     </modules>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>ianal-maven-plugin</artifactId>
+                <configuration>
+                    <!-- Don't bother with legal check if never published -->
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <!-- Don't publish these artifacts to central -->
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml?rev=834639&r1=834638&r2=834639&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml Tue Nov 10 20:06:08 2009
@@ -109,8 +109,22 @@
                                 <groupId>org.apache.geronimo.configs</groupId>
                                 <artifactId>openjpa2</artifactId>
                             </obsoletes>
+                            <!-- config.xml and offline-deployer-config.xml -->
+                            <config-xml-content server="default" />
+                            <config-xml-content server="offline" />
+                            <!-- handle openjpa to openjpa2 CAR alias -->
                             <artifact-alias key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/openjpa/${geronimoVersion}/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
+                            <!-- handle geronimo-jpa_3.0 to 2.0 JAR alias -->
+                            <artifact-alias key="org.apache.geronimo.specs/geronimo-jpa_3.0_spec//jar">org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${jpa2specVersion}/jar</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.specs/geronimo-jpa_3.0_spec/1.1.1/jar">org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${jpa2specVersion}/jar</artifact-alias>
+                            <!-- handle geronimo-jpa_1.0 to 2.0 JAR alias -->
+                            <artifact-alias key="org.apache.geronimo.specs/geronimo-jpa_1.0_spec//jar">org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${jpa2specVersion}/jar</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.specs/geronimo-jpa_1.0_spec/1.1.2/jar">org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${jpa2specVersion}/jar</artifact-alias>
+                            <!-- handle openjpa-1.x to 2.x JAR alias -->
+                            <artifact-alias key="org.apache.openjpa/openjpa//jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
+                            <artifact-alias key="org.apache.openjpa/openjpa/1.0.3/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
+                            <artifact-alias key="org.apache.openjpa/openjpa/1.2.1/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml?rev=834639&r1=834638&r2=834639&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml Tue Nov 10 20:06:08
2009
@@ -33,7 +33,7 @@
     <name>Geronimo Plugins, OpenJPA2 :: Deployer</name>
     <packaging>car</packaging>
 
-    <description>Geronimo JPA 1.0 Persistence Unit deployer</description>
+    <description>Geronimo JPA 2.0 Persistence Unit deployer</description>
 
     <dependencies>
         <dependency>
@@ -50,11 +50,15 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction</artifactId>
             <type>car</type>
             <version>${geronimoVersion}</version>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
@@ -65,6 +69,10 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <category>Persistence</category>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
@@ -76,7 +84,15 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>persistence-jpa10-deployer</artifactId>
+                            </obsoletes>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>persistence-jpa20-deployer</artifactId>
+                            </obsoletes>
+                            <config-xml-content server="default">
                                 <gbean name="PersistenceUnitBuilder">
                                     <attribute name="defaultPersistenceProviderClassName">org.apache.openjpa.persistence.PersistenceProviderImpl</attribute>
                                     <attribute name="defaultPersistenceUnitProperties">
@@ -120,22 +136,16 @@
                                     </attribute>
                                 </gbean>
                             </config-xml-content>
-                            <obsoletes>
-                                <groupId>org.apache.geronimo.configs</groupId>
-                                <artifactId>persistence-jpa10-deployer</artifactId>
-                            </obsoletes>
-                            <obsoletes>
-                                <groupId>org.apache.geronimo.configs</groupId>
-                                <artifactId>persistence-jpa20-deployer</artifactId>
-                            </obsoletes>
+                            <!-- handle persistence-jpa10-deployer to jpa20 -->
                             <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer//car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
-                            <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</artifact-alias>
+                            <!-- handle geronimo-persistence-jpa10 to jpa20 -->
+                            <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10//jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${version}/jar</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/${geronimoVersion}/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${version}/jar</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-
 </project>

Modified: geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/src/main/history/dependencies.xml?rev=834639&r1=834638&r2=834639&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/src/main/history/dependencies.xml
Tue Nov 10 20:06:08 2009
@@ -27,4 +27,9 @@
         <artifactId>geronimo-persistence-jpa20</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/plugins/openjpa2/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/pom.xml?rev=834639&r1=834638&r2=834639&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/pom.xml Tue Nov 10 20:06:08 2009
@@ -189,10 +189,11 @@
 
     <modules>
         <module>geronimo-openjpa2</module>
+        <module>openjpa2</module>
         <module>geronimo-persistence-jpa20</module>
         <module>geronimo-persistence-jpa20-builder</module>
-        <module>openjpa2</module>
         <module>persistence-jpa20-deployer</module>
+        <module>jpa-tests</module>
     </modules>
 
     <build>



Mime
View raw message