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/24 20:13:41 UTC
svn commit: r757964 - in /cxf/branches/2.1.x-fixes: ./
distribution/src/main/release/BUILDING.txt parent/pom.xml
tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java
Author: dkulp
Date: Tue Mar 24 19:13:39 2009
New Revision: 757964
URL: http://svn.apache.org/viewvc?rev=757964&view=rev
Log:
Merged revisions 754585 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r754585 | dkulp | 2009-03-14 22:02:37 -0400 (Sat, 14 Mar 2009) | 3 lines
Update versions of various things
[CXF-2114] Patch aplied
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/distribution/src/main/release/BUILDING.txt
cxf/branches/2.1.x-fixes/parent/pom.xml
cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 24 19:13:39 2009
@@ -1 +1 @@
-/cxf/trunk:753380,753397,753421
+/cxf/trunk:753380,753397,753421,754585
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/BUILDING.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/BUILDING.txt?rev=757964&r1=757963&r2=757964&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/BUILDING.txt (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/BUILDING.txt Tue Mar 24 19:13:39 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/branches/2.1.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=757964&r1=757963&r2=757964&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Tue Mar 24 19:13:39 2009
@@ -65,7 +65,7 @@
<jdom.version>1.0</jdom.version>
<xmlbeans.version>2.3.0</xmlbeans.version>
<abdera.version>0.4.0-incubating</abdera.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/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java?rev=757964&r1=757963&r2=757964&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java (original)
+++ cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java Tue Mar 24 19:13:39 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("\\$", "\\."));
}
}