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 2007/05/14 21:08:40 UTC
svn commit: r537952 - in /incubator/cxf/trunk: pom.xml
tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java
Author: dkulp
Date: Mon May 14 12:08:39 2007
New Revision: 537952
URL: http://svn.apache.org/viewvc?view=rev&rev=537952
Log:
Wire fault bean generator into j2w code
Modified:
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java
Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=537952&r1=537951&r2=537952
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Mon May 14 12:08:39 2007
@@ -298,7 +298,6 @@
<id>deploy</id>
<modules>
<module>distribution</module>
- <module>tools/eclipse-plugin</module>
<module>tools/eclipse3.1-plugin</module>
</modules>
<build>
Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java?view=diff&rev=537952&r1=537951&r2=537952
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java (original)
+++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java Mon May 14 12:08:39 2007
@@ -21,6 +21,7 @@
import java.lang.reflect.Method;
import java.rmi.RemoteException;
+import java.rmi.ServerException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -68,7 +69,8 @@
|| Fault.class.isAssignableFrom(exClazz)
|| exClazz.equals(RuntimeException.class)
|| exClazz.equals(Throwable.class)
- || exClazz.equals(RemoteException.class)) {
+ || exClazz.equals(RemoteException.class)
+ || exClazz.equals(ServerException.class)) {
continue;
}
Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java?view=diff&rev=537952&r1=537951&r2=537952
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java (original)
+++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java Mon May 14 12:08:39 2007
@@ -46,6 +46,7 @@
import org.apache.cxf.tools.common.WSDLConstants;
import org.apache.cxf.tools.java2wsdl.generator.AbstractGenerator;
import org.apache.cxf.tools.java2wsdl.generator.WSDLGeneratorFactory;
+import org.apache.cxf.tools.java2wsdl.generator.wsdl11.FaultBeanGenerator;
import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WrapperBeanGenerator;
import org.apache.cxf.tools.java2wsdl.processor.internal.ServiceBuilder;
import org.apache.cxf.tools.java2wsdl.processor.internal.ServiceBuilderFactory;
@@ -84,12 +85,20 @@
generators.add(getWSDLGenerator(wsdlFile));
generators.add(getWrapperBeanGenerator());
+ generators.add(getFaultBeanGenerator());
generate(service, outputDir);
}
private AbstractGenerator getWrapperBeanGenerator() {
WrapperBeanGenerator generator = new WrapperBeanGenerator();
+ generator.setOutputBase(getSourceDir());
+ generator.setCompileToDir(getClassesDir());
+ return generator;
+ }
+
+ private AbstractGenerator getFaultBeanGenerator() {
+ FaultBeanGenerator generator = new FaultBeanGenerator();
generator.setOutputBase(getSourceDir());
generator.setCompileToDir(getClassesDir());
return generator;