geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r471383 - in /geronimo/sandbox/javaee5: ./ assemblies-jee5/geronimo-boilerplate-jee5/ assemblies-jee5/geronimo-jetty5-jee5/ assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/ assemblies-jee5/geronimo-jetty6-jee5/ assemblies-jee5/gero...
Date Sun, 05 Nov 2006 09:03:55 GMT
Author: djencks
Date: Sun Nov  5 01:03:54 2006
New Revision: 471383

URL: http://svn.apache.org/viewvc?view=rev&rev=471383
Log:
GERONIMO-2460 implement a bunch of stuff so jpa runtime jpa enhancement sometimes works.  You need to start the server with an agent specified.  See issue for some details

Added:
    geronimo/sandbox/javaee5/configs-jee5/transformer-agent/
      - copied from r469819, geronimo/server/trunk/configs/online-deployer/
    geronimo/sandbox/javaee5/configs-jee5/transformer-agent/LICENSE.txt
      - copied unchanged from r471379, geronimo/server/trunk/configs/online-deployer/LICENSE.txt
    geronimo/sandbox/javaee5/configs-jee5/transformer-agent/NOTICE.txt
      - copied unchanged from r471379, geronimo/server/trunk/configs/online-deployer/NOTICE.txt
    geronimo/sandbox/javaee5/configs-jee5/transformer-agent/pom.xml
      - copied, changed from r471379, geronimo/server/trunk/configs/online-deployer/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/transformer-agent/src/
      - copied from r471379, geronimo/server/trunk/configs/online-deployer/src/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/pom.xml
      - copied, changed from r464280, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java   (with props)
Modified:
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/assembly/bin.xml
    geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml
    geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/pom.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
    geronimo/sandbox/javaee5/modules-jee5/pom.xml
    geronimo/sandbox/javaee5/pom.xml

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml Sun Nov  5 01:03:54 2006
@@ -21,9 +21,9 @@
 <!-- $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.assemblies</groupId>
         <artifactId>assemblies-jee5</artifactId>
@@ -91,6 +91,24 @@
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>install-lib</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-transformer</artifactId>
+                                    <version>${pom.version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml Sun Nov  5 01:03:54 2006
@@ -18,9 +18,9 @@
 <!-- $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.assemblies</groupId>
         <artifactId>assemblies-jee5</artifactId>
@@ -89,7 +89,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-corba</artifactId>
+            <artifactId>j2ee-corba-yoko</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -159,7 +159,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-corba</artifactId>
+            <artifactId>client-corba-yoko</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml Sun Nov  5 01:03:54 2006
@@ -48,7 +48,7 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/j2ee-corba/${version}/car" load="false">
+    <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml Sun Nov  5 01:03:54 2006
@@ -18,9 +18,9 @@
 <!-- $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.assemblies</groupId>
         <artifactId>assemblies-jee5</artifactId>
@@ -31,34 +31,41 @@
     <artifactId>geronimo-jetty6-jee5</artifactId>
     <name>Geronimo Assemblies :: JEE5 + Jetty6</name>
     <packaging>application-assembly</packaging>
-    
+
     <description>
         An assembly of Geronimo into a J2EE Server using Jetty as the web container.
     </description>
-    
+
     <dependencies>
-        
+
+        <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>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
@@ -106,7 +113,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-clustering-wadi</artifactId>
@@ -127,77 +134,77 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>ldap-realm</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-broker</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-system</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-security</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-corba-yoko</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>javamail</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/assembly/bin.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/assembly/bin.xml Sun Nov  5 01:03:54 2006
@@ -45,12 +45,20 @@
         
         <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>
             </includes>
         </dependencySet>
-        
+
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>client.jar</outputFileNameMapping>

Modified: geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/pom.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/pom.xml Sun Nov  5 01:03:54 2006
@@ -85,13 +85,13 @@
         </dependency>
 
         <dependency>
-            <groupId>incubator-activemq</groupId>
+            <groupId>org.apache.activemq</groupId>
             <artifactId>activecluster</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>incubator-activemq</groupId>
-             <artifactId>activemq</artifactId>
+            <groupId>org.apache.activemq</groupId>
+             <artifactId>activemq-core</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/openjpa/pom.xml Sun Nov  5 01:03:54 2006
@@ -38,13 +38,11 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-all</artifactId>
-            <version>0.9.0-incubating-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>net.sourceforge.serp</groupId>
             <artifactId>serp</artifactId>
-            <version>1.11.0</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/javaee5/configs-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/pom.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/pom.xml Sun Nov  5 01:03:54 2006
@@ -113,6 +113,7 @@
     </build>
 
     <modules>
+        <module>transformer-agent</module>
         <module>client-transaction-jta11</module>
         <module>transaction-jta11</module>
         <module>persistence-jpa10-deployer</module>

Modified: geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml Sun Nov  5 01:03:54 2006
@@ -83,6 +83,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transformer</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.objectweb.howl</groupId>
             <artifactId>howl</artifactId>
         </dependency>

Copied: geronimo/sandbox/javaee5/configs-jee5/transformer-agent/pom.xml (from r471379, geronimo/server/trunk/configs/online-deployer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/transformer-agent/pom.xml?view=diff&rev=471383&p1=geronimo/server/trunk/configs/online-deployer/pom.xml&r1=471379&p2=geronimo/sandbox/javaee5/configs-jee5/transformer-agent/pom.xml&r2=471383
==============================================================================
--- geronimo/server/trunk/configs/online-deployer/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/transformer-agent/pom.xml Sun Nov  5 01:03:54 2006
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
- 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
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
   
   http://www.apache.org/licenses/LICENSE-2.0
   
@@ -21,18 +20,18 @@
 <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.configs</groupId>
-        <artifactId>configs</artifactId>
+        <artifactId>configs-jee5</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>online-deployer</artifactId>
-    <name>Geronimo Configs :: Online Deployer</name>
+    <artifactId>transformer-agent</artifactId>
+    <name>Geronimo Configs :: Transformer Agent</name>
     <packaging>car</packaging>
-
+    
     <build>
         <plugins>
             <plugin>
@@ -43,104 +42,24 @@
                         <manifestEntries>
                             <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
                             <Extension-Dirs>lib/ext</Extension-Dirs>
+                            <Premain-Class>org.apache.geronimo.transformer.TransformerAgent</Premain-Class>
                         </manifestEntries>
                         <manifest>
-                            <mainClass>org.apache.geronimo.deployment.cli.DeployTool</mainClass>
+                            <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
                         </manifest>
                     </archive>
-
+                    
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->
                     <classpath>
                         <element>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-common</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-system</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-util</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deployment</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deploy-jsr88</artifactId>
-                            <version>${version}</version>
+                            <entry>server.jar</entry>
                         </element>
                         <element>
                             <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-deploy-tool</artifactId>
+                            <artifactId>geronimo-transformer</artifactId>
                             <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-                        </element>
-                        <element>
-                            <groupId>mx4j</groupId>
-                            <artifactId>mx4j</artifactId>
-                        </element>
-                        <element>
-                            <groupId>mx4j</groupId>
-                            <artifactId>mx4j-remote</artifactId>
-                        </element>
-                        <element>
-                            <groupId>commons-cli</groupId>
-                            <artifactId>commons-cli</artifactId>
-                        </element>
-                        <element>
-                            <groupId>commons-logging</groupId>
-                            <artifactId>commons-logging</artifactId>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <element>
-                            <groupId>log4j</groupId>
-                            <artifactId>log4j</artifactId>
-                        </element>
-                        <element>
-                            <groupId>jline</groupId>
-                            <artifactId>jline</artifactId>
-                        </element>
-                        <element>
-                            <groupId>xpp3</groupId>
-                            <artifactId>xpp3</artifactId>
-                        </element>
-                        <element>
-                            <groupId>xstream</groupId>
-                            <artifactId>xstream</artifactId>
-                        </element>
-                        <element>
-                            <groupId>xerces</groupId>
-                            <artifactId>xercesImpl</artifactId>
-                            <classpathPrefix>../lib/endorsed</classpathPrefix>
-                        </element>
-                        <element>
-                            <groupId>xerces</groupId>
-                            <artifactId>xmlParserAPIs</artifactId>
-                            <classpathPrefix>../lib/endorsed</classpathPrefix>
-                        </element>
-                        <element>
-                            <!-- IMPORTANT: server.jar is required for offline deployer to work -->
-                            <entry>server.jar</entry>
                         </element>
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>

Modified: geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/pom.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/pom.xml (original)
+++ geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/pom.xml Sun Nov  5 01:03:54 2006
@@ -13,6 +13,7 @@
     <url>http://maven.apache.org</url>
     <build>
         <plugins>
+<!--
             <plugin>
               <artifactId>maven-antrun-plugin</artifactId>
               <executions>
@@ -44,6 +45,7 @@
                 </execution>
               </executions>
             </plugin>
+-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ejb-plugin</artifactId>
@@ -65,7 +67,7 @@
         <dependency>
           <groupId>org.apache.openjpa</groupId>
           <artifactId>openjpa-persistence-jdbc</artifactId>
-          <version>0.9.0-incubating-SNAPSHOT</version>
+          <version>0.9.6-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java Sun Nov  5 01:03:54 2006
@@ -50,7 +50,7 @@
 import org.apache.xmlbeans.QNameSet;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class PersistenceUnitBuilder implements NamespaceDrivenBuilder {
     private static final QName PERSISTENCE_QNAME = PersistenceDocument.type.getDocumentElementName();
@@ -140,7 +140,7 @@
                 }
                 gbeanData.setAttribute("managedClassNames", managedClassNames);
                 if (persistenceUnit.isSetExcludeUnlistedClasses()) {
-                    gbeanData.setAttribute("excludeUnlistedClassesValue", persistenceUnit.getExcludeUnlistedClasses());
+                    gbeanData.setAttribute("excludeUnlistedClasses", persistenceUnit.getExcludeUnlistedClasses());
                 } else {
                     gbeanData.setAttribute("excludeUnlistedClassesValue", false);
                 }

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/pom.xml Sun Nov  5 01:03:54 2006
@@ -104,6 +104,11 @@
             <artifactId>geronimo-connector</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transformer</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java Sun Nov  5 01:03:54 2006
@@ -38,6 +38,8 @@
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.connector.outbound.ConnectionFactorySource;
+import org.apache.geronimo.transformer.TransformerAgent;
+import org.apache.geronimo.kernel.classloader.JarFileClassLoader;
 
 /**
  * @version $Rev$ $Date$
@@ -48,7 +50,7 @@
     private final EntityManagerFactory entityManagerFactory;
     private final TransactionManagerImpl transactionManager;
 
-    
+
     public PersistenceUnitGBean() {
         persistenceUnitInfo = null;
         entityManagerFactory = null;
@@ -160,16 +162,18 @@
     }
 
     public void addTransformer(ClassTransformer classTransformer) {
+        persistenceUnitInfo.addTransformer(classTransformer);
     }
 
     public ClassLoader getNewTempClassLoader() {
-        return null;
+        return persistenceUnitInfo.getNewTempClassLoader();
     }
 
     public void doStart() throws Exception {
     }
 
     public void doStop() throws Exception {
+        //TODO remove any classtransformers added
         entityManagerFactory.close();
     }
 
@@ -256,10 +260,11 @@
         }
 
         public void addTransformer(ClassTransformer classTransformer) {
+            TransformerAgent.addTransformer(new TransformerWrapper(classTransformer, classLoader));
         }
 
         public ClassLoader getNewTempClassLoader() {
-            return null;
+            return JarFileClassLoader.copy(classLoader);
         }
 
     }
@@ -268,6 +273,8 @@
 
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(PersistenceUnitGBean.class);
+        //TODO uncomment if gbean start priority feature is accepted.
+//        infoBuilder.setPriority(GBeanInfo.PRIORITY_CLASSLOADER);
 
         infoBuilder.addAttribute("persistenceUnitName", String.class, true, true);
         infoBuilder.addAttribute("persistenceProviderClassName", String.class, true, true);
@@ -276,7 +283,7 @@
         infoBuilder.addAttribute("jarFileUrls", List.class, true, true);
         infoBuilder.addAttribute("persistenceUnitRootUrl", URL.class, true, true);
         infoBuilder.addAttribute("managedClassNames", List.class, true, true);
-        infoBuilder.addAttribute("excludeUnlistedClassesValue", boolean.class, true, true);
+        infoBuilder.addAttribute("excludeUnlistedClasses", boolean.class, true, true);
         infoBuilder.addAttribute("properties", Properties.class, true, true);
         infoBuilder.addReference("TransactionManager", TransactionManagerImpl.class, NameFactory.TRANSACTION_MANAGER);
         infoBuilder.addReference("JtaDataSourceWrapper", ConnectionFactorySource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
@@ -294,7 +301,7 @@
                 "jarFileUrls",
                 "persistenceUnitRootUrl",
                 "managedClassNames",
-                "excludeUnlistedClassesValue",
+                "excludeUnlistedClasses",
                 "properties",
                 "TransactionManager",
                 "classLoader"

Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java?view=auto&rev=471383
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java Sun Nov  5 01:03:54 2006
@@ -0,0 +1,54 @@
+/*
+ * 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.persistence;
+
+import java.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.IllegalClassFormatException;
+import java.security.ProtectionDomain;
+
+import javax.persistence.spi.ClassTransformer;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class TransformerWrapper implements ClassFileTransformer {
+
+    private final ClassTransformer classTransformer;
+    private final ClassLoader classLoader;
+
+    public TransformerWrapper(ClassTransformer classTransformer, ClassLoader classLoader) {
+        this.classTransformer = classTransformer;
+        this.classLoader = classLoader;
+    }
+
+    public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
+        if (loader != classLoader) {
+            return null;
+        }
+        try {
+            return classTransformer.transform(loader, className, classBeingRedefined,  protectionDomain, classfileBuffer);
+        } catch (IllegalClassFormatException e) {
+            throw e;
+        } catch (RuntimeException e) {
+            return null;
+        }
+    }
+}

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/pom.xml (from r464280, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/pom.xml?view=diff&rev=471383&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml&r1=464280&p2=geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/pom.xml&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/pom.xml Sun Nov  5 01:03:54 2006
@@ -28,41 +28,10 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-cxf-builder</artifactId>
-    <name>Geronimo :: CXF :: Builder</name>
+    <artifactId>geronimo-transformer</artifactId>
+    <name>Geronimo :: Transformer</name>
     
     <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-cxf</artifactId>
-            <version>${pom.version}</version>                                                                                                           
-        </dependency>
-
-        <!-- this is a dependency of geronimo-cxf.  Why isn't it picked up? -->
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        </dependency>
-
-
     </dependencies>
     
     <build>

Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java?view=auto&rev=471383
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java Sun Nov  5 01:03:54 2006
@@ -0,0 +1,44 @@
+/*
+ * 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.transformer;
+
+import java.lang.instrument.Instrumentation;
+import java.lang.instrument.ClassFileTransformer;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class TransformerAgent {
+
+    private static final TransformerCollection transformerCollection = new TransformerCollection();
+
+    public static void premain(String args, Instrumentation inst) {
+        inst.addTransformer(transformerCollection);
+    }
+
+    public static void addTransformer(ClassFileTransformer classFileTransformer) {
+        transformerCollection.addTransformer(classFileTransformer);
+    }
+
+    public static void removeTransformer(ClassFileTransformer classFileTransformer) {
+        transformerCollection.removeTransformer(classFileTransformer);
+    }
+}

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java?view=auto&rev=471383
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java Sun Nov  5 01:03:54 2006
@@ -0,0 +1,56 @@
+/*
+ * 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.transformer;
+
+import java.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.IllegalClassFormatException;
+import java.security.ProtectionDomain;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class TransformerCollection implements ClassFileTransformer {
+
+    private final List<ClassFileTransformer> transformers = new ArrayList<ClassFileTransformer>();
+
+    public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
+        boolean changed = false;
+        for (ClassFileTransformer transformer : transformers) {
+            byte[] transformed = transformer.transform(loader, className, classBeingRedefined, protectionDomain, classfileBuffer);
+            if (transformed != null) {
+                changed = true;
+                classfileBuffer = transformed;
+            }
+        }
+        return changed? classfileBuffer: null;
+    }
+
+    public void addTransformer(ClassFileTransformer classFileTransformer) {
+        transformers.add(classFileTransformer);
+    }
+
+    public void removeTransformer(ClassFileTransformer classFileTransformer) {
+        transformers.remove(classFileTransformer);
+    }
+}

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerCollection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/javaee5/modules-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/pom.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/modules-jee5/pom.xml Sun Nov  5 01:03:54 2006
@@ -45,6 +45,7 @@
     </dependencies>
     
     <modules>
+        <module>geronimo-transformer</module>
         <module>geronimo-transaction-jta11</module>
         <module>geronimo-persistence-jpa10</module>
         <module>geronimo-persistence-jpa10-builder</module>

Modified: geronimo/sandbox/javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/pom.xml?view=diff&rev=471383&r1=471382&r2=471383
==============================================================================
--- geronimo/sandbox/javaee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/pom.xml Sun Nov  5 01:03:54 2006
@@ -280,6 +280,17 @@
                 <version>1.6.1</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.openjpa</groupId>
+                <artifactId>openjpa-all</artifactId>
+                <version>0.9.6-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.sourceforge.serp</groupId>
+                <artifactId>serp</artifactId>
+                <version>1.11.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 



Mime
View raw message