You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/08/17 01:57:31 UTC
svn commit: r432073 - in /geronimo/xbean/branches/colossus: maven-xbean-plugin/ maven-xbean-plugin/src/main/java/org/apache/xbean/maven/ xbean-spring-common/ xbean-spring-common/src/main/java/org/apache/xbean/spring/generator/ xbean-spring-v1/ xbean-sp...

Author: dain
Date: Wed Aug 16 16:57:29 2006
New Revision: 432073

URL: http://svn.apache.org/viewvc?rev=432073&view=rev
Log:
Change spring modules back to being compiled with 1.4

Modified:
    geronimo/xbean/branches/colossus/maven-xbean-plugin/pom.xml
    geronimo/xbean/branches/colossus/maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java
    geronimo/xbean/branches/colossus/xbean-spring-common/pom.xml
    geronimo/xbean/branches/colossus/xbean-spring-common/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java
    geronimo/xbean/branches/colossus/xbean-spring-v1/pom.xml
    geronimo/xbean/branches/colossus/xbean-spring-v2/pom.xml

Modified: geronimo/xbean/branches/colossus/maven-xbean-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/maven-xbean-plugin/pom.xml?rev=432073&r1=432072&r2=432073&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/maven-xbean-plugin/pom.xml (original)
+++ geronimo/xbean/branches/colossus/maven-xbean-plugin/pom.xml Wed Aug 16 16:57:29 2006
@@ -9,6 +9,17 @@
   <packaging>maven-plugin</packaging>
   <name>Maven XBean Plugin</name>
   <version>COL-SNAPSHOT</version>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>

Modified: geronimo/xbean/branches/colossus/maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java?rev=432073&r1=432072&r2=432073&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java (original)
+++ geronimo/xbean/branches/colossus/maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java Wed Aug 16 16:57:29 2006
@@ -96,7 +96,7 @@
         getLog().debug( "namespace[" + namespace + "]" );
         getLog().debug( "srcDir[" + srcDir + "]" );
         getLog().debug( "schema[" + schema + "]" );
-        getLog().debug( "excludedClasses" + Arrays.asList(excludedClasses) );
+        getLog().debug( "excludedClasses[" + excludedClasses + "]" );
         getLog().debug( "outputDir[" + outputDir + "]" );
         getLog().debug( "propertyEditorPaths[" + propertyEditorPaths + "]" );
 

Modified: geronimo/xbean/branches/colossus/xbean-spring-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-common/pom.xml?rev=432073&r1=432072&r2=432073&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-common/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-common/pom.xml Wed Aug 16 16:57:29 2006
@@ -8,6 +8,17 @@
   <artifactId>xbean-spring-common</artifactId>
   <name>XBean :: Spring :: Common</name>
   <version>COL-SNAPSHOT</version>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <dependencies>
     <dependency>
       <groupId>mx4j</groupId>

Modified: geronimo/xbean/branches/colossus/xbean-spring-common/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-common/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java?rev=432073&r1=432072&r2=432073&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-common/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-common/src/main/java/org/apache/xbean/spring/generator/QdoxMappingLoader.java Wed Aug 16 16:57:29 2006
@@ -504,7 +504,7 @@
         if (sourceName.endsWith(".java")) {
             className = className.substring(0, className.length() - ".java".length());
         }
-        className = className.replace("/", ".");
+        className = className.replace('/', '.');
         for (int i = 0; i < excludedClasses.length; i++) {
             String excludedClass = excludedClasses[i];
             if (className.equals(excludedClass)) {

Modified: geronimo/xbean/branches/colossus/xbean-spring-v1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-v1/pom.xml?rev=432073&r1=432072&r2=432073&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-v1/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-v1/pom.xml Wed Aug 16 16:57:29 2006
@@ -19,6 +19,13 @@
     </testResources>
     <plugins>
       <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>

Modified: geronimo/xbean/branches/colossus/xbean-spring-v2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-spring-v2/pom.xml?rev=432073&r1=432072&r2=432073&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-spring-v2/pom.xml (original)
+++ geronimo/xbean/branches/colossus/xbean-spring-v2/pom.xml Wed Aug 16 16:57:29 2006
@@ -19,6 +19,13 @@
     </testResources>
     <plugins>
       <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>