You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/03/15 03:02:39 UTC

svn commit: r754585 - in /cxf/trunk: distribution/src/main/release/BUILDING.txt parent/pom.xml rt/ws/security/pom.xml tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java

Author: dkulp
Date: Sun Mar 15 02:02:37 2009
New Revision: 754585

URL: http://svn.apache.org/viewvc?rev=754585&view=rev
Log:
Update versions of various things
[CXF-2114] Patch aplied

Modified:
    cxf/trunk/distribution/src/main/release/BUILDING.txt
    cxf/trunk/parent/pom.xml
    cxf/trunk/rt/ws/security/pom.xml
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java

Modified: cxf/trunk/distribution/src/main/release/BUILDING.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/BUILDING.txt?rev=754585&r1=754584&r2=754585&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/BUILDING.txt (original)
+++ cxf/trunk/distribution/src/main/release/BUILDING.txt Sun Mar 15 02:02:37 2009
@@ -36,8 +36,7 @@
 
 Building kit
 ------------
-1) Change to the "distribution" directory of Apache CXF source distribution.
-2) Run 
-         $> mvn
+1) From top level, run
+         $> mvn -Pfastinstall,everything
    This will build an Apache CXF distribution kit under "distribution/target"
    directory.

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=754585&r1=754584&r2=754585&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Sun Mar 15 02:02:37 2009
@@ -61,7 +61,7 @@
         <stax.impl.version>3.2.6</stax.impl.version>
         <wsdl4j.version>1.6.2</wsdl4j.version>
         <xmlbeans.version>2.3.0</xmlbeans.version>
-        <xmlschema.version>1.4.3</xmlschema.version>
+        <xmlschema.version>1.4.4</xmlschema.version>
         <checkstyle.extension />
 
         <spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>

Modified: cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=754585&r1=754584&r2=754585&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/pom.xml (original)
+++ cxf/trunk/rt/ws/security/pom.xml Sun Mar 15 02:02:37 2009
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.ws.security</groupId>
             <artifactId>wss4j</artifactId>
-            <version>1.5.6-SNAPSHOT</version>
+            <version>1.5.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>axis</groupId>

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java?rev=754585&r1=754584&r2=754585&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java Sun Mar 15 02:02:37 2009
@@ -202,12 +202,14 @@
             && getPackageName().equals(i.substring(0, i.lastIndexOf(".")))) {
             return;
         }
-        imports.add(i);
+        // replace "$" with "." to correctly deal with member classes
+        imports.add(i.replaceAll("\\$", "\\."));
     }
     
     public void addImports(Collection<String> ii) {
         for (String i : ii) {
-            imports.add(i);
+            // replace "$" with "." to correctly deal with member classes
+            imports.add(i.replaceAll("\\$", "\\."));
         }
     }