geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r472729 - in /geronimo/server/trunk: ./ assemblies/geronimo-boilerplate-j2ee/ assemblies/geronimo-jetty-j2ee/ assemblies/geronimo-jetty-j2ee/src/main/assembly/ assemblies/geronimo-jetty-j2ee/src/main/var/config/ configs/ configs/openjpa/ co...
Date Thu, 09 Nov 2006 01:14:51 GMT
Author: djencks
Date: Wed Nov  8 17:14:49 2006
New Revision: 472729

URL: http://svn.apache.org/viewvc?view=rev&rev=472729
Log:
GERONIMO-2460 Copy jpa support into trunk.  jetty-j2ee server only so far.  Daytrader w/preenhanced
classes works, runtime enhancement not yet tested

Added:
    geronimo/server/trunk/configs/openjpa/
      - copied from r471379, geronimo/sandbox/javaee5/configs-jee5/openjpa/
    geronimo/server/trunk/configs/openjpa/LICENSE.txt
      - copied unchanged from r472728, geronimo/sandbox/javaee5/configs-jee5/openjpa/LICENSE.txt
    geronimo/server/trunk/configs/openjpa/NOTICE.txt
      - copied unchanged from r472728, geronimo/sandbox/javaee5/configs-jee5/openjpa/NOTICE.txt
    geronimo/server/trunk/configs/openjpa/pom.xml
      - copied, changed from r472728, geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml
    geronimo/server/trunk/configs/openjpa/src/
      - copied from r472728, geronimo/sandbox/javaee5/configs-jee5/openjpa/src/
    geronimo/server/trunk/configs/persistence-jpa10-deployer/
      - copied from r471379, geronimo/sandbox/javaee5/configs-jee5/persistence-jpa10-deployer/
    geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml
      - copied unchanged from r472728, geronimo/sandbox/javaee5/configs-jee5/persistence-jpa10-deployer/pom.xml
    geronimo/server/trunk/configs/persistence-jpa10-deployer/src/
      - copied from r472728, geronimo/sandbox/javaee5/configs-jee5/persistence-jpa10-deployer/src/
    geronimo/server/trunk/configs/transformer-agent/
      - copied from r471383, geronimo/sandbox/javaee5/configs-jee5/transformer-agent/
    geronimo/server/trunk/configs/transformer-agent/LICENSE.txt
      - copied unchanged from r472728, geronimo/sandbox/javaee5/configs-jee5/transformer-agent/LICENSE.txt
    geronimo/server/trunk/configs/transformer-agent/NOTICE.txt
      - copied unchanged from r472728, geronimo/sandbox/javaee5/configs-jee5/transformer-agent/NOTICE.txt
    geronimo/server/trunk/configs/transformer-agent/pom.xml
      - copied unchanged from r472728, geronimo/sandbox/javaee5/configs-jee5/transformer-agent/pom.xml
    geronimo/server/trunk/configs/transformer-agent/src/
      - copied from r472728, geronimo/sandbox/javaee5/configs-jee5/transformer-agent/src/
    geronimo/server/trunk/modules/geronimo-persistence-jpa10/
      - copied from r471379, geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/
    geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/
      - copied from r471379, geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/
    geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/LICENSE.txt
      - copied unchanged from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/NOTICE.txt
      - copied unchanged from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/pom.xml
      - copied, changed from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/src/
      - copied from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/
    geronimo/server/trunk/modules/geronimo-persistence-jpa10/LICENSE.txt
      - copied unchanged from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-persistence-jpa10/NOTICE.txt
      - copied unchanged from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml
      - copied, changed from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml
    geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/
      - copied from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/
    geronimo/server/trunk/modules/geronimo-transformer/
      - copied from r471383, geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/
    geronimo/server/trunk/modules/geronimo-transformer/pom.xml
      - copied, changed from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/pom.xml
    geronimo/server/trunk/modules/geronimo-transformer/src/
      - copied from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/configs/transaction/pom.xml
    geronimo/server/trunk/configs/transaction/src/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java
    geronimo/server/trunk/modules/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java
    geronimo/server/trunk/modules/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java
    geronimo/server/trunk/modules/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml Wed Nov  8 17:14:49
2006
@@ -105,6 +105,7 @@
                                     <groupId>org.apache.derby</groupId>
                                     <artifactId>derbytools</artifactId>
                                 </artifact>
+
                             </artifacts>
                         </configuration>
                     </execution>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml Wed Nov  8 17:14:49 2006
@@ -41,6 +41,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transformer-agent</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -195,14 +202,14 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis-deployer</artifactId>
+            <artifactId>persistence-jpa10-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-deployer</artifactId>
+            <artifactId>axis-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -216,7 +223,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty-deployer</artifactId>
+            <artifactId>client-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -273,6 +280,13 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>sharedlib</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml Wed Nov
 8 17:14:49 2006
@@ -46,6 +46,14 @@
         
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
+            <outputFileNameMapping>jpa.jar</outputFileNameMapping>
+            <includes>
+                <include>org.apache.geronimo.configs:transformer-agent</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>server.jar</outputFileNameMapping>
             <includes>
                 <include>org.apache.geronimo.configs:j2ee-system</include>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Wed
Nov  8 17:14:49 2006
@@ -123,20 +123,51 @@
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
         </gbean>
     </module>
+    
+    <module name="org.apache.geronimo.configs/connector-deployer/${version}/car">
+        <gbean name="ResourceRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        </gbean>
+
+        <gbean name="AdminObjectRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        </gbean>
 
-    <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
+    </module>
+
+    <module name="org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car"
condition="java.is1_5"/>
 
     <module name="org.apache.geronimo.configs/openejb-deployer/${version}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=JettyWebContainer</attribute>
+            <reference name="ServiceBuilders">
+                <pattern>
+                    <name>GBeanBuilder</name>
+                </pattern>
+                <pattern>
+                    <name>PersistenceUnitBuilder</name>
+                </pattern>
+            </reference>
+        </gbean>
+        <gbean name="OpenEjbRemoteRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
         </gbean>
-    </module>
 
-    <module name="org.apache.geronimo.configs/openejb-corba-deployer/${version}/car" load="false"/>
+        <gbean name="OpenEjbClientRemoteRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        </gbean>
+
+        <gbean name="OpenEjbLocalRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        </gbean>
 
-    <module name="org.apache.geronimo.configs/client-deployer/${version}/car"/>
+    </module>
+    
+    <module name="org.apache.geronimo.configs/client-deployer/${version}/car">
+    </module>
 
-    <module name="org.apache.geronimo.configs/axis-deployer/${version}/car"/>
+    <module name="org.apache.geronimo.configs/axis-deployer/${version}/car">
+    </module>
 
     <module name="org.apache.geronimo.configs/javamail/${version}/car" load="false">
         <gbean name="SMTPTransport">

Copied: geronimo/server/trunk/configs/openjpa/pom.xml (from r472728, geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openjpa/pom.xml?view=diff&rev=472729&p1=geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml&r1=472728&p2=geronimo/server/trunk/configs/openjpa/pom.xml&r2=472729
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml (original)
+++ geronimo/server/trunk/configs/openjpa/pom.xml Wed Nov  8 17:14:49 2006
@@ -57,7 +57,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Wed Nov  8 17:14:49 2006
@@ -173,6 +173,12 @@
         <module>welcome-tomcat</module>
         <module>dojo-jetty</module>
         <module>dojo-tomcat</module>
+
+        <!-- jee5 configs -->
+        <module>transformer-agent</module>
+        <module>persistence-jpa10-deployer</module>
+        <module>openjpa</module>
+
     </modules>
 
 </project>

Modified: geronimo/server/trunk/configs/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/pom.xml?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/configs/transaction/pom.xml (original)
+++ geronimo/server/trunk/configs/transaction/pom.xml Wed Nov  8 17:14:49 2006
@@ -66,6 +66,23 @@
             <artifactId>howl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-persistence-jpa10</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transformer</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/configs/transaction/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/src/plan/plan.xml?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/configs/transaction/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/transaction/src/plan/plan.xml Wed Nov  8 17:14:49 2006
@@ -91,4 +91,12 @@
         </references>
     </gbean>
 
+    <gbean name="TransactionManagerBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
+        <attribute name="name">TransactionManager</attribute>
+        <attribute name="abstractNameQuery">?name=TransactionManager#</attribute>
+        <reference name="Context">
+            <name>JavaContext</name>
+        </reference>
+    </gbean>
+    
 </module>

Copied: geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/pom.xml (from r472728,
geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/pom.xml?view=diff&rev=472729&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/pom.xml&r1=472728&p2=geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/pom.xml&r2=472729
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10-builder/pom.xml Wed Nov  8 17:14:49
2006
@@ -64,7 +64,17 @@
     </dependencies>
     
     <build>
-    </build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+     </build>
 
 </project>
 

Copied: geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml (from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml?view=diff&rev=472729&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml&r1=472728&p2=geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml&r2=472729
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10/pom.xml Wed Nov  8 17:14:49 2006
@@ -50,37 +50,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>validate-java-version</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>require-java-version</goal>
-                        </goals>
-                        <configuration>
-                            <version>1.5*</version>
-                        </configuration>
-                    </execution>
-
-                    <!--
-                    NOTE: This will copy LICENSE.txt and NOTICE.txt to classes/META-INF.
-
-                          Its a itty-bitty HACK to avoid adding resource definitions to
-                          the build, which causes the Eclipse plugin to generate invalid
-                          .classpath files. :-(
-                    -->
-                    <execution>
-                        <id>install-legal-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-legal-files</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>

Modified: geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java
(original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java
Wed Nov  8 17:14:49 2006
@@ -27,7 +27,7 @@
 import javax.persistence.spi.ClassTransformer;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class TransformerWrapper implements ClassFileTransformer {
 

Copied: geronimo/server/trunk/modules/geronimo-transformer/pom.xml (from r472728, geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transformer/pom.xml?view=diff&rev=472729&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/pom.xml&r1=472728&p2=geronimo/server/trunk/modules/geronimo-transformer/pom.xml&r2=472729
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-transformer/pom.xml Wed Nov  8 17:14:49 2006
@@ -35,6 +35,16 @@
     </dependencies>
     
     <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
 </project>

Modified: geronimo/server/trunk/modules/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java
(original)
+++ geronimo/server/trunk/modules/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java
Wed Nov  8 17:14:49 2006
@@ -24,7 +24,7 @@
 import java.lang.instrument.ClassFileTransformer;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class TransformerAgent {
 

Modified: geronimo/server/trunk/modules/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java
(original)
+++ geronimo/server/trunk/modules/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java
Wed Nov  8 17:14:49 2006
@@ -28,7 +28,7 @@
 import java.util.Iterator;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class TransformerCollection implements ClassFileTransformer {
 

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Wed Nov  8 17:14:49 2006
@@ -97,6 +97,12 @@
         <module>geronimo-webservices</module>
         <module>geronimo-webservices-builder</module>
 
+        <!-- jee 5 modules -->
+        <module>geronimo-transformer</module>
+        <module>geronimo-persistence-jpa10</module>
+        <module>geronimo-persistence-jpa10-builder</module>
+
+
     </modules>
     
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=472729&r1=472728&r2=472729
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Nov  8 17:14:49 2006
@@ -192,6 +192,20 @@
                 <version>1.0.1</version>
             </dependency>
 
+            <!-- jee5 specs -->
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jpa_3.0_spec</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+
+
             <!--
             NOTE: The full source for this artifact is private due to Sun licensing issues.
                   To view the generated XmlBeans source please see the -src artifact in the
repository:
@@ -207,7 +221,12 @@
                 <artifactId>geronimo-schema-j2ee_1.4</artifactId>
                 <version>1.1-SNAPSHOT</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.apache.geronimo.schema</groupId>
+                <artifactId>geronimo-schema-jee_5</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
+            
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-naming</artifactId>



Mime
View raw message