You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by mm...@apache.org on 2008/01/03 07:48:37 UTC
svn commit: r608363 -
/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
Author: mmao
Date: Wed Jan 2 22:48:36 2008
New Revision: 608363
URL: http://svn.apache.org/viewvc?rev=608363&view=rev
Log:
CXF-1350
* WSDL2Java compiler should include the extra generated jaxb artifacts
e.g files generated by jaxb plugins
Modified:
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java?rev=608363&r1=608362&r2=608363&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java Wed Jan 2 22:48:36 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;