geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r414159 - in /geronimo/xbean/trunk: pom.xml xbean-spring-common/src/main/java/org/apache/xbean/spring/context/impl/QNameReflectionHelper.java xbean-spring-itests/pom.xml
Date Wed, 14 Jun 2006 09:08:01 GMT
Author: gnodet
Date: Wed Jun 14 02:08:00 2006
New Revision: 414159

URL: http://svn.apache.org/viewvc?rev=414159&view=rev
Log:
XBEAN-16: Fix use of JDK 5 only features
Use profiles to exclude jdk 5 specific modules

Modified:
    geronimo/xbean/trunk/pom.xml
    geronimo/xbean/trunk/xbean-spring-common/src/main/java/org/apache/xbean/spring/context/impl/QNameReflectionHelper.java
    geronimo/xbean/trunk/xbean-spring-itests/pom.xml

Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?rev=414159&r1=414158&r2=414159&view=diff
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Wed Jun 14 02:08:00 2006
@@ -152,7 +152,6 @@
   </build>
 
   <modules>
-    <module>xbean-finder</module>
     <module>xbean-classpath</module>
     <!--
     <module>xbean-jmx</module>
@@ -167,9 +166,22 @@
     <module>xbean-spring</module>
     <module>xbean-spring-itests</module>
     <module>xbean-telnet</module>
-    <module>xbean-tiger</module>
     <module>maven-xbean-plugin</module>
   </modules>
+
+  <profiles>
+      <profile>
+        <id>jdk1.5</id>
+        <activation>
+          <jdk>1.5</jdk>
+        </activation>
+        <modules>
+          <module>xbean-tiger</module>
+          <module>xbean-finder</module>
+        </modules>
+      </profile>
+  </profiles>
+  
 
   <dependencies>
     <dependency>

Modified: geronimo/xbean/trunk/xbean-spring-common/src/main/java/org/apache/xbean/spring/context/impl/QNameReflectionHelper.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-common/src/main/java/org/apache/xbean/spring/context/impl/QNameReflectionHelper.java?rev=414159&r1=414158&r2=414159&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-common/src/main/java/org/apache/xbean/spring/context/impl/QNameReflectionHelper.java
(original)
+++ geronimo/xbean/trunk/xbean-spring-common/src/main/java/org/apache/xbean/spring/context/impl/QNameReflectionHelper.java
Wed Jun 14 02:08:00 2006
@@ -69,15 +69,19 @@
     }
 
     protected static Method findMethod(String name) {
-        Class type = PropertyEditorHelper.loadClass("org.apache.xbean.spring.context.impl.QNameHelper");
-        if (type != null) {
-            Method[] methods = type.getMethods();
-            for (int i = 0; i < methods.length; i++) {
-                Method method = methods[i];
-                if (method.getName().equals(name)) {
-                    return method;
+        try {
+            Class type = PropertyEditorHelper.loadClass("org.apache.xbean.spring.context.impl.QNameHelper");
+            if (type != null) {
+                Method[] methods = type.getMethods();
+                for (int i = 0; i < methods.length; i++) {
+                    Method method = methods[i];
+                    if (method.getName().equals(name)) {
+                        return method;
+                    }
                 }
             }
+        } catch (Throwable t) {
+            // Ignore, this is usually because QName method is not in the classpath 
         }
         return null;
     }

Modified: geronimo/xbean/trunk/xbean-spring-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-itests/pom.xml?rev=414159&r1=414158&r2=414159&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-itests/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-spring-itests/pom.xml Wed Jun 14 02:08:00 2006
@@ -27,4 +27,19 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+  <profiles>
+    <profile>
+      <id>jdk1.4</id>
+      <activation>
+        <jdk>1.4</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-qname_1.1_spec</artifactId>
+          <version>1.0</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>



Mime
View raw message