geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r936005 - in /geronimo/server/trunk: framework/buildsupport/car-maven-plugin/ framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/configs/ framework/configs/client-system/ framework/configs/...
Date Tue, 20 Apr 2010 17:22:21 GMT
Author: djencks
Date: Tue Apr 20 17:22:21 2010
New Revision: 936005

URL: http://svn.apache.org/viewvc?rev=936005&view=rev
Log:
GERONIMO-4680 get class transformers working somewhat in karaf.  Make karaf script start geronimo

Removed:
    geronimo/server/trunk/framework/configs/transformer-agent/
Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/server/trunk/framework/configs/client-system/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
    geronimo/server/trunk/framework/configs/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-transformer/pom.xml
    geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Tue Apr 20 17:22:21
2010
@@ -126,6 +126,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-transformer</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-spec-corba</artifactId>
             <version>1.1-SNAPSHOT</version>

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
Tue Apr 20 17:22:21 2010
@@ -835,6 +835,7 @@ public abstract class AbstractCarMojo
                         "org.apache.geronimo.system.sharedlib," +
                         "org.apache.geronimo.system.threads," +
                         "org.apache.geronimo.system.util," +
+                        "org.apache.geronimo.transformer," +
                         "org.apache.geronimo.mavenplugins.car," +
                         "org.apache.felix.karaf.jaas.boot;version=\"1.5.0\"," +
                         "org.apache.yoko," +

Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Tue Apr 20 17:22:21 2010
@@ -152,72 +152,72 @@
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->
-                    <classpath>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-cli</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-crypto</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <!--
-                        NOTE: geronimo-transformer is on the system classpath to avoid a
potential deadlock. See GERONIMO-3141.
-                        -->
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-transformer</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-all</artifactId>
-                        </element>
-                        <element>
-                            <groupId>commons-cli</groupId>
-                            <artifactId>commons-cli</artifactId>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <!--<element>-->
-                        <!--<groupId>org.slf4j</groupId>-->
-                        <!--<artifactId>slf4j-api</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                        <!--<groupId>org.slf4j</groupId>-->
-                        <!--<artifactId>slf4j-log4j12</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                        <!--<groupId>org.slf4j</groupId>-->
-                        <!--<artifactId>jcl-over-slf4j</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                        <!--<groupId>log4j</groupId>-->
-                        <!--<artifactId>log4j</artifactId>-->
-                        <!--</element>-->
-                        <element>
-                            <groupId>xpp3</groupId>
-                            <artifactId>xpp3_min</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.xbean</groupId>
-                            <artifactId>xbean-reflect</artifactId>
-                        </element>
-                        <element>
-                            <groupId>com.thoughtworks.xstream</groupId>
-                            <artifactId>xstream</artifactId>
-                        </element>
-                    </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
+                    <!--<classpath>-->
+                        <!--<element>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-cli</artifactId>-->
+                            <!--<version>${version}</version>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-crypto</artifactId>-->
+                            <!--<version>${version}</version>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-kernel</artifactId>-->
+                            <!--<version>${version}</version>-->
+                        <!--</element>-->
+                        <!--&lt;!&ndash;-->
+                        <!--NOTE: geronimo-transformer is on the system classpath to avoid
a potential deadlock. See GERONIMO-3141.-->
+                        <!--&ndash;&gt;-->
+                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<groupId>org.apache.geronimo.framework</groupId>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<artifactId>geronimo-transformer</artifactId>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<version>${version}</version>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
+                        <!--<element>-->
+                            <!--<groupId>asm</groupId>-->
+                            <!--<artifactId>asm-all</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>commons-cli</groupId>-->
+                            <!--<artifactId>commons-cli</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>cglib</groupId>-->
+                            <!--<artifactId>cglib-nodep</artifactId>-->
+                        <!--</element>-->
+                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<groupId>org.slf4j</groupId>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<artifactId>slf4j-api</artifactId>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<groupId>org.slf4j</groupId>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<artifactId>slf4j-log4j12</artifactId>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<groupId>org.slf4j</groupId>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<artifactId>jcl-over-slf4j</artifactId>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<groupId>log4j</groupId>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<artifactId>log4j</artifactId>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
+                        <!--<element>-->
+                            <!--<groupId>xpp3</groupId>-->
+                            <!--<artifactId>xpp3_min</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.apache.xbean</groupId>-->
+                            <!--<artifactId>xbean-reflect</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>com.thoughtworks.xstream</groupId>-->
+                            <!--<artifactId>xstream</artifactId>-->
+                        <!--</element>-->
+                    <!--</classpath>-->
+                    <!--<classpathPrefix>../lib</classpathPrefix>-->
 
                     <category>Geronimo Core</category>
                     <instance>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Tue Apr 20 17:22:21 2010
@@ -65,12 +65,6 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-transformer</artifactId>
-            <version>${version}</version>
-        </dependency>
-
         <!-- Used by TemporaryClassLoader in kernel -->
         <dependency>
             <groupId>asm</groupId>
@@ -206,65 +200,65 @@
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->
-                    <classpath>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-cli</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-crypto</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-config-groovy-transformer</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.codehaus.groovy</groupId>
-                            <artifactId>groovy-all-minimal</artifactId>
-                        </element>
-                        <!--
-                        NOTE: geronimo-transformer needs to be on the system classpath to
avoid a potential deadlock. See GERONIMO-3141.
-                        -->
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-transformer</artifactId>
-                            <version>${version}</version>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-all</artifactId>
-                        </element>
-                        <element>
-                            <groupId>commons-cli</groupId>
-                            <artifactId>commons-cli</artifactId>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <element>
-                            <groupId>xpp3</groupId>
-                            <artifactId>xpp3_min</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.xbean</groupId>
-                            <artifactId>xbean-reflect</artifactId>
-                        </element>
-                        <element>
-                            <groupId>com.thoughtworks.xstream</groupId>
-                            <artifactId>xstream</artifactId>
-                        </element>
-                    </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
+                    <!--<classpath>-->
+                        <!--<element>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-cli</artifactId>-->
+                            <!--<version>${version}</version>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-crypto</artifactId>-->
+                            <!--<version>${version}</version>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-kernel</artifactId>-->
+                            <!--<version>${version}</version>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-config-groovy-transformer</artifactId>-->
+                            <!--<version>${version}</version>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.codehaus.groovy</groupId>-->
+                            <!--<artifactId>groovy-all-minimal</artifactId>-->
+                        <!--</element>-->
+                        <!--&lt;!&ndash;-->
+                        <!--NOTE: geronimo-transformer needs to be on the system classpath
to avoid a potential deadlock. See GERONIMO-3141.-->
+                        <!--&ndash;&gt;-->
+                        <!--<element>-->
+                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                            <!--<artifactId>geronimo-transformer</artifactId>-->
+                            <!--<version>${version}</version>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>asm</groupId>-->
+                            <!--<artifactId>asm-all</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>commons-cli</groupId>-->
+                            <!--<artifactId>commons-cli</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>cglib</groupId>-->
+                            <!--<artifactId>cglib-nodep</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>xpp3</groupId>-->
+                            <!--<artifactId>xpp3_min</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>org.apache.xbean</groupId>-->
+                            <!--<artifactId>xbean-reflect</artifactId>-->
+                        <!--</element>-->
+                        <!--<element>-->
+                            <!--<groupId>com.thoughtworks.xstream</groupId>-->
+                            <!--<artifactId>xstream</artifactId>-->
+                        <!--</element>-->
+                    <!--</classpath>-->
+                    <!--<classpathPrefix>../lib</classpathPrefix>-->
 
                     <category>Geronimo Core</category>
                     <config-xml-content load="false" />

Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
Tue Apr 20 17:22:21 2010
@@ -92,11 +92,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-transformer</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-activation_1.1_spec</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Tue Apr 20 17:22:21 2010
@@ -443,6 +443,13 @@
             <artifactId>geronimo-shell-base</artifactId>
             <version>${version}</version>
         </dependency>
+        <!--agent -->
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-transformer</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- endorsed -->
         <dependency>
             <groupId>org.apache.yoko</groupId>
@@ -628,12 +635,12 @@
                                     <outputDirectory>target/dependencies/lib/endorsed</outputDirectory>
                                     <destFileName>yoko-rmi-spec.jar</destFileName>
                                 </artifactItem>
-                                <!--<artifactItem>-->
-                                    <!--<groupId>org.apache.xbean</groupId>-->
-                                    <!--<artifactId>xbean-naming</artifactId>-->
-                                    <!--<outputDirectory>target/dependencies/lib</outputDirectory>-->
-                                    <!--<destFileName>xbean-naming.jar</destFileName>-->
-                                <!--</artifactItem>                            
   -->
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.framework</groupId>
+                                    <artifactId>geronimo-transformer</artifactId>
+                                    <outputDirectory>target/dependencies/lib/agent</outputDirectory>
+                                    <destFileName>transformer.jar</destFileName>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf
Tue Apr 20 17:22:21 2010
@@ -26,15 +26,20 @@ PROGNAME=`basename $0`
 #
 
 if [ "x$JAVA_MIN_MEM" = "x" ]; then
-    JAVA_MIN_MEM=128M
+    JAVA_MIN_MEM=1024M
     export JAVA_MIN_MEM
 fi
 
 if [ "x$JAVA_MAX_MEM" = "x" ]; then
-    JAVA_MAX_MEM=512M
+    JAVA_MAX_MEM=2048M
     export JAVA_MAX_MEM
 fi
 
+if [ "x$JAVA_MAX_PERM_SIZE" = "x" ]; then
+    JAVA_MAX_PERM_SIZE=512M
+    export JAVA_MAX_PERM_SIZE
+fi
+
 warn() {
     echo "${PROGNAME}: $*"
 }
@@ -201,7 +206,7 @@ setupDebugOptions() {
 }
 
 setupDefaults() {
-    DEFAULT_JAVA_OPTS="-Xms$JAVA_MIN_MEM -Xmx$JAVA_MAX_MEM "
+    DEFAULT_JAVA_OPTS="-Xms$JAVA_MIN_MEM -Xmx$JAVA_MAX_MEM -XX:MaxPermSize=$JAVA_MAX_PERM_SIZE
"
 
     #Set the JVM_VENDOR specific JVM flags
     if [ "$JVM_VENDOR" = "SUN" ]; then
@@ -225,7 +230,12 @@ setupDefaults() {
             CLASSPATH="$CLASSPATH:$file"
         fi
     done
-    DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
+
+    EXT_DIRS="$KARAF_HOME/lib/ext:$JAVA_HOME/lib/ext"
+    ENDORSED_DIRS="$KARAF_HOME/lib/endorsed:$JAVA_HOME/lib/endorsed"
+    JAVA_AGENT_JAR="$KARAF_HOME/lib/agent/transformer.jar"
+    
+    DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
 
     ##
     ## TODO: Move to conf/profiler/yourkit.{sh|cmd}
@@ -284,8 +294,21 @@ run() {
         KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
         KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
         CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+        EXT_DIRS=`cygpath --path --windows "$EXT_DIRS"`
+        ENDORSED_DIRS=`cygpath --path --windows "$ENDORSED_DIRS"`
     fi
-    exec $JAVA $JAVA_OPTS -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties
$OPTS -classpath "$CLASSPATH" org.apache.felix.karaf.main.Bootstrap "$@"
+    exec $JAVA $JAVA_OPTS \
+        -javaagent:"$JAVA_AGENT_JAR" \
+        -Dorg.apache.geronimo.home.dir="$KARAF_HOME" \
+        -Dkaraf.home="$KARAF_HOME" \
+        -Dkaraf.base="$KARAF_BASE" \
+        -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties \
+        -Djava.endorsed.dirs="$ENDORSED_DIRS" \
+        -Djava.ext.dirs="$EXT_DIRS" \
+        $OPTS \
+        -classpath "$CLASSPATH" \
+        org.apache.geronimo.cli.daemon.DaemonCLI \
+        "$@"
 }
 
 main() {

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
Tue Apr 20 17:22:21 2010
@@ -49,7 +49,8 @@ org.osgi.framework.system.packages.extra
  org.apache.geronimo.cli.daemon; version=${karaf.osgi.version}, \
  org.apache.geronimo.cli.client; version=${karaf.osgi.version}, \
  org.apache.geronimo.cli.shutdown; version=${karaf.osgi.version}, \
- org.apache.geronimo.cli.deployer; version=${karaf.osgi.version}
+ org.apache.geronimo.cli.deployer; version=${karaf.osgi.version}, \
+ org.apache.geronimo.transformer; version=${karaf.osgi.version}
 
 # javax.transaction is needed to avoid class loader constraint violation when using javax.sql
 org.osgi.framework.bootdelegation=sun.*,com.sun.*,javax.transaction,javax.transaction.*

Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Tue Apr 20 17:22:21 2010
@@ -48,9 +48,7 @@
         <module>shutdown</module>
         <module>upgrade-cli</module>
         <module>upgrade</module>
-        <module>transformer-agent</module>
         <module>jmx-security</module>
-        <!--<module>geronimo-boilerplate</module>-->
         <module>karaf-framework</module>
     </modules>
     

Modified: geronimo/server/trunk/framework/modules/geronimo-transformer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-transformer/pom.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-transformer/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-transformer/pom.xml Tue Apr 20 17:22:21
2010
@@ -40,5 +40,19 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Premain-Class>org.apache.geronimo.transformer.TransformerAgent</Premain-Class>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
 

Modified: geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml (original)
+++ geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml Tue Apr 20 17:22:21 2010
@@ -34,10 +34,6 @@
     <name>Geronimo Plugins, AspectJ :: AspectJ</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>aspectjrt</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.bundles</groupId>
@@ -60,6 +56,7 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-transformer</artifactId>
             <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Tue Apr
20 17:22:21 2010
@@ -77,11 +77,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-transformer</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-client</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml Tue Apr 20
17:22:21 2010
@@ -64,17 +64,6 @@
             <version>${version}</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-persistence-jpa20</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-transformer</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml Tue Apr 20 17:22:21
2010
@@ -93,12 +93,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-transformer</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.howl</artifactId>
         </dependency>

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml Tue Apr 20 17:22:21
2010
@@ -45,6 +45,7 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-transformer</artifactId>
             <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java?rev=936005&r1=936004&r2=936005&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java
(original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/src/main/java/org/apache/geronimo/persistence/TransformerWrapper.java
Tue Apr 20 17:22:21 2010
@@ -36,9 +36,9 @@ public class TransformerWrapper implemen
     }
 
     public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException
{
-        if (loader != classLoader) {
-            return null;
-        }
+//        if (loader != classLoader) {
+//            return null;
+//        }
         try {
             return classTransformer.transform(loader, className, classBeingRedefined,  protectionDomain,
classfileBuffer);
         } catch (IllegalClassFormatException e) {



Mime
View raw message