geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r709224 - in /geronimo/server/branches/2.1: ./ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/ framework/modules/geronimo-kernel/src/mai...
Date Thu, 30 Oct 2008 19:01:48 GMT
Author: gawor
Date: Thu Oct 30 12:01:47 2008
New Revision: 709224

URL: http://svn.apache.org/viewvc?rev=709224&view=rev
Log:
switch back to asm 2.2.3 and xbean 3.3 except xbean-naming (GERONIMO-4375)

Modified:
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
    geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
    geronimo/server/branches/2.1/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
    geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml?rev=709224&r1=709223&r2=709224&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
(original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
Thu Oct 30 12:01:47 2008
@@ -261,7 +261,7 @@
                         <dependency>
                             <groupId>asm</groupId>
                             <artifactId>asm</artifactId>
-                            <version>3.1</version>
+                            <version>2.2.3</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
@@ -275,7 +275,7 @@
                         <dependency>
                             <groupId>asm</groupId>
                             <artifactId>asm-commons</artifactId>
-                            <version>3.1</version>
+                            <version>2.2.3</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml?rev=709224&r1=709223&r2=709224&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
Thu Oct 30 12:01:47 2008
@@ -68,7 +68,7 @@
         <dependency start="false">
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
-            <version>3.1</version>
+            <version>2.2.3</version>
             <type>jar</type>
         </dependency>
         <dependency start="false">
@@ -80,7 +80,7 @@
         <dependency start="false">
             <groupId>asm</groupId>
             <artifactId>asm-commons</artifactId>
-            <version>3.1</version>
+            <version>2.2.3</version>
             <type>jar</type>
         </dependency>
         <dependency start="false">

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml?rev=709224&r1=709223&r2=709224&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
(original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
Thu Oct 30 12:01:47 2008
@@ -74,7 +74,7 @@
       <dependency>
         <groupId>asm</groupId>
         <artifactId>asm</artifactId>
-        <version>3.1</version>
+        <version>2.2.3</version>
         <type>jar</type>
         <import>classes</import>
       </dependency>
@@ -88,7 +88,7 @@
       <dependency>
         <groupId>asm</groupId>
         <artifactId>asm-commons</artifactId>
-        <version>3.1</version>
+        <version>2.2.3</version>
         <type>jar</type>
         <import>classes</import>
       </dependency>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java?rev=709224&r1=709223&r2=709224&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
(original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
Thu Oct 30 12:01:47 2008
@@ -129,7 +129,7 @@
    private static boolean isAnnotationClass(byte[] bytes) {
        IsAnnotationVisitor isAnnotationVisitor = new IsAnnotationVisitor();
        ClassReader classReader = new ClassReader(bytes);
-       classReader.accept(isAnnotationVisitor, ClassReader.SKIP_DEBUG);
+       classReader.accept(isAnnotationVisitor, true);
        return isAnnotationVisitor.isAnnotation;
    }
 

Modified: geronimo/server/branches/2.1/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java?rev=709224&r1=709223&r2=709224&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
(original)
+++ geronimo/server/branches/2.1/plugins/client/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
Thu Oct 30 12:01:47 2008
@@ -134,11 +134,11 @@
                 clientSubject = loginContext.getSubject();
             }
             ContextManager.setCallers(clientSubject, clientSubject);
-            Class mainClass = classLoader.loadClass(mainClassName);
-            ObjectRecipe objectRecipe = new ObjectRecipe(mainClass);
+            ObjectRecipe objectRecipe = new ObjectRecipe(mainClassName);
             objectRecipe.allow(Option.FIELD_INJECTION);
             objectRecipe.allow(Option.PRIVATE_PROPERTIES);
             objectRecipe.allow(Option.STATIC_PROPERTIES);
+            Class mainClass = classLoader.loadClass(mainClassName);
             List<Injection> injections = new ArrayList<Injection>();
             while (mainClass != null && mainClass != Object.class) {
                 List<Injection> perClass = holder.getInjections(mainClass.getName());
@@ -170,7 +170,7 @@
                     throw new Exception("Some objects to be injected were not found in jndi:
" + problems);
                 }
             }
-            Class clazz = objectRecipe.setStaticProperties();
+            Class clazz = objectRecipe.setStaticProperties(classLoader);
             if (holder.getPostConstruct() != null) {
                 Holder.apply(null, clazz, holder.getPostConstruct());
             }

Modified: geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml?rev=709224&r1=709223&r2=709224&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
(original)
+++ geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
Thu Oct 30 12:01:47 2008
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-reflect</artifactId>
-      <version>3.3</version>
+      <version>${xbeanVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.swizzle</groupId>

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=709224&r1=709223&r2=709224&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Thu Oct 30 12:01:47 2008
@@ -82,7 +82,7 @@
         <springVersion>2.0.5</springVersion>
         <plutoVersion>1.1.6-G643117</plutoVersion>
         <openjpaVersion>1.2.0</openjpaVersion>
-        <xbeanVersion>3.5-SNAPSHOT</xbeanVersion>
+        <xbeanVersion>3.3</xbeanVersion>
         <wadiVersion>2.0</wadiVersion>
 
         <!-- Deployers -->
@@ -323,7 +323,7 @@
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-naming</artifactId>
-                <version>${xbeanVersion}</version>
+                <version>3.5-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -347,13 +347,13 @@
             <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm</artifactId>
-                <version>3.1</version>
+                <version>2.2.3</version>
             </dependency>
 
             <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm-commons</artifactId>
-                <version>3.1</version>
+                <version>2.2.3</version>
                 <exclusions>
                     <exclusion>
                         <groupId>asm</groupId>



Mime
View raw message