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 2008/01/04 21:40:50 UTC
svn commit: r608990 - in /incubator/cxf/branches/2.0.x-fixes: ./
tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
Author: dkulp
Date: Fri Jan 4 12:40:48 2008
New Revision: 608990
URL: http://svn.apache.org/viewvc?rev=608990&view=rev
Log:
Merged revisions 608363 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r608363 | mmao | 2008-01-03 01:48:36 -0500 (Thu, 03 Jan 2008) | 5 lines
CXF-1350
* WSDL2Java compiler should include the extra generated jaxb artifacts
e.g files generated by jaxb plugins
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java?rev=608990&r1=608989&r2=608990&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java Fri Jan 4 12:40:48 2008
@@ -31,6 +31,7 @@
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.tools.util.ClassCollector;
import org.apache.cxf.tools.util.Compiler;
@@ -96,6 +97,15 @@
}
}
}
+ // JAXB plugins will generate extra files under the runtime directory
+ // Those files can not be allocated into the ClassCollector
+ File jaxbRuntime = new File(path, "runtime");
+ if (jaxbRuntime.isDirectory() && jaxbRuntime.exists()) {
+ List<File> files = FileUtils.getFiles(jaxbRuntime, ".+\\.java$");
+ for (File f : files) {
+ fileList.add(f.toString());
+ }
+ }
}
}
@@ -115,7 +125,6 @@
}
int srcFileIndex = i;
-
for (Object o : fileList.toArray()) {
String file = (String)o;
arguments[i] = file;