cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r533981 - in /incubator/cxf/trunk: rt/frontend/jaxws/ systests/src/test/java/org/apache/cxf/systest/mtom/ tools/common/src/main/java/org/apache/cxf/tools/common/ tools/common/src/main/java/org/apache/cxf/tools/common/model/ tools/javato/ to...
Date Tue, 01 May 2007 09:26:05 GMT
Author: mmao
Date: Tue May  1 02:26:04 2007
New Revision: 533981

URL: http://svn.apache.org/viewvc?view=rev&rev=533981
Log:
* Tools Code cleanup
* Fix the MtomServerTest on windows platform

Removed:
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/WSDLException.java
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/WSDLModel.java
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/WSDLParameter.java
    incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/JCodeModelFilter.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/GreeterStringArray.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/GreeterStringArrayImpl.java
Modified:
    incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java
    incubator/cxf/trunk/tools/javato/pom.xml
    incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGenerator.java
    incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
    incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java

Modified: incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/pom.xml?view=diff&rev=533981&r1=533980&r2=533981
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/pom.xml Tue May  1 02:26:04 2007
@@ -56,13 +56,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-
-        <dependency>
             <groupId>javax.xml.ws</groupId>
             <artifactId>jaxws-api</artifactId>
         </dependency>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java?view=diff&rev=533981&r1=533980&r2=533981
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
Tue May  1 02:26:04 2007
@@ -176,7 +176,7 @@
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         IOUtils.copy(inAtt.getDataHandler().getInputStream(), out);
         out.close();
-        assertEquals(197, out.size());
+        assertTrue(out.size() > 196 && out.size() < 201);
     }
 
     @Override

Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java?view=diff&rev=533981&r1=533980&r2=533981
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
(original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
Tue May  1 02:26:04 2007
@@ -123,23 +123,6 @@
         }
     }
     
-//     public File parseOutputName(String packageName, String filename, String ext) throws
ToolException {
-//         FileWriterUtil fw = null;
-//         Writer writer = null;
-
-//         FileUtils.mkDir(new File(this.baseDir));
-        
-//         fw = new FileWriterUtil(this.baseDir);
-//         try {
-//             writer = fw.getWriter(packageName, filename + ext);
-//         } catch (IOException ioe) {
-//             Message msg = new Message("FAIL_TO_WRITE_FILE", LOG, packageName + "." + filename
+ ext);
-//             throw new ToolException(msg, ioe);
-//         }
-
-//         return writer;
-//     }
-
     public void setCommonAttributes() {
         attributes.put("currentdate", Calendar.getInstance().getTime());
         attributes.put("version", Version.getCurrentVersion());

Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java?view=diff&rev=533981&r1=533980&r2=533981
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
(original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
Tue May  1 02:26:04 2007
@@ -42,15 +42,12 @@
     private String soapAction;
     private SOAPBinding.Style soapStyle;
     private SOAPBinding.Use soapUse;
-    private WSDLParameter requestParameter;
-    private WSDLParameter responseParameter;
     private boolean wrapperStyle;
     private boolean enableMime = true;
     private JavaInterface javaInterface;
     private final List<JavaParameter> parameters = new ArrayList<JavaParameter>();
     private final List<JavaException> exceptions = new ArrayList<JavaException>();
     private final Map<String, JavaAnnotation> annotations = new HashMap<String,
JavaAnnotation>();
-    private final List<WSDLException> wsdlExceptions = new ArrayList<WSDLException>();
 
     private JavaCodeBlock block;
     
@@ -244,35 +241,6 @@
 
     public Map<String, JavaAnnotation> getAnnotationMap() {
         return this.annotations;
-    }
-
-    public void addWSDLException(WSDLException exception) {
-        if (wsdlExceptions.contains(exception)) {
-            Message message = new Message("EXCEPTION_ALREADY_EXIST", LOG, 
-                                          exception.getDetailType().getName());
-            throw new ToolException(message);
-        }
-        wsdlExceptions.add(exception);
-    }
-
-    public List<WSDLException> getWSDLExceptions() {
-        return wsdlExceptions;
-    }
-
-    public void addRequest(WSDLParameter param) {
-        this.requestParameter = param;
-    }
-
-    public WSDLParameter getRequest() {
-        return this.requestParameter;
-    }
-
-    public void addResponse(WSDLParameter param) {
-        this.responseParameter = param;
-    }
-
-    public WSDLParameter getResponse() {
-        return this.responseParameter;
     }
 
     public List<String> getParameterList() {

Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java?view=diff&rev=533981&r1=533980&r2=533981
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java
(original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java
Tue May  1 02:26:04 2007
@@ -19,7 +19,6 @@
 
 package org.apache.cxf.tools.common.model;
 
-import com.sun.xml.bind.api.TypeReference;
 
 public class JavaParameter extends JavaType implements JavaAnnotatable {
 
@@ -33,11 +32,7 @@
     
     public JavaParameter() {
     }
-    public JavaParameter(String pname, TypeReference pref , JavaType.Style pstyle) {
-        name = pname;
-        typeRef = pref;
-        style = pstyle;
-    }
+
     public JavaParameter(String n, String t, String tns) {
         super(n, t, tns);
     }

Modified: incubator/cxf/trunk/tools/javato/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/pom.xml?view=diff&rev=533981&r1=533980&r2=533981
==============================================================================
--- incubator/cxf/trunk/tools/javato/pom.xml (original)
+++ incubator/cxf/trunk/tools/javato/pom.xml Tue May  1 02:26:04 2007
@@ -68,20 +68,6 @@
 
 
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-        <dependency>
             <groupId>javax.xml.soap</groupId>
             <artifactId>saaj-api</artifactId>
         </dependency>
@@ -127,11 +113,6 @@
             <artifactId>jaxb-impl</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
-	    <version>${project.version}</version>
-        </dependency>
 
 
     </dependencies>

Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGenerator.java?view=diff&rev=533981&r1=533980&r2=533981
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGenerator.java
(original)
+++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGenerator.java
Tue May  1 02:26:04 2007
@@ -34,7 +34,6 @@
 import org.apache.cxf.tools.util.FileWriterUtil;
 
 public final class WrapperBeanGenerator extends AbstractGenerator<File> {
-    private Class<?> serviceClass;
     private File compileToDir;
     
     public File generate(final File sourcedir) {
@@ -53,15 +52,6 @@
         compileToDir = f;
     }
 
-
-    public Class<?> getServiceClass() {
-        return this.serviceClass;
-    }
-    
-    public void setServiceClass(Class<?> clz) {
-        this.serviceClass = clz;
-    }
-    
     private void generateWrapperBeanClasses(final ServiceInfo serviceInfo, final File dir)
{
         List<JavaClass> wrapperClasses = new ArrayList<JavaClass>();
         

Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java?view=diff&rev=533981&r1=533980&r2=533981
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
(original)
+++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
Tue May  1 02:26:04 2007
@@ -22,14 +22,13 @@
 import org.apache.cxf.tools.common.model.Annotator;
 import org.apache.cxf.tools.common.model.JavaAnnotatable;
 import org.apache.cxf.tools.common.model.JavaAnnotation;
-import org.apache.cxf.tools.common.model.JavaInterface;
 import org.apache.cxf.tools.java2wsdl.generator.wsdl11.model.WrapperBeanClass;
 
 public class WrapperBeanAnnotator implements Annotator {
 
     public void annotate(final JavaAnnotatable clz) {
         WrapperBeanClass wrapperBeanClass = null;
-        if (clz instanceof JavaInterface) {
+        if (clz instanceof WrapperBeanClass) {
             wrapperBeanClass = (WrapperBeanClass) clz;
         } else {
             throw new RuntimeException("WrapperBeanAnnotator expect JavaClass as input");

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=533981&r1=533980&r2=533981
==============================================================================
--- 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
Tue May  1 02:26:04 2007
@@ -91,7 +91,6 @@
     private AbstractGenerator getWrapperBeanGenerator() {
         WrapperBeanGenerator generator = new WrapperBeanGenerator();
         generator.setOutputBase(getSourceDir());
-        generator.setServiceClass(getServiceClass());
         generator.setCompileToDir(getClassesDir());
         return generator;
     }



Mime
View raw message