axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r442111 - in /webservices/axis2/trunk/java/modules: codegen/src/org/apache/axis2/wsdl/codegen/emitter/ codegen/src/org/apache/axis2/wsdl/template/java/ kernel/src/org/apache/axis2/deployment/repository/util/ kernel/src/org/apache/axis2/desc...
Date Mon, 11 Sep 2006 06:24:58 GMT
Author: chinthaka
Date: Sun Sep 10 23:24:57 2006
New Revision: 442111

URL: http://svn.apache.org/viewvc?view=rev&rev=442111
Log:
Fixing http://issues.apache.org/jira/browse/AXIS2-931.

Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=442111&r1=442110&r2=442111
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
Sun Sep 10 23:24:57 2006
@@ -1,32 +1,7 @@
 package org.apache.axis2.wsdl.codegen.emitter;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.URIResolver;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.dom.DOMSource;
-
 import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.description.AxisMessage;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.PolicyInclude;
-import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.*;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.PolicyUtil;
 import org.apache.axis2.util.Utils;
@@ -36,25 +11,9 @@
 import org.apache.axis2.wsdl.WSDLUtil;
 import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
 import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-import org.apache.axis2.wsdl.codegen.writer.AntBuildWriter;
-import org.apache.axis2.wsdl.codegen.writer.CallbackHandlerWriter;
-import org.apache.axis2.wsdl.codegen.writer.ClassWriter;
-import org.apache.axis2.wsdl.codegen.writer.InterfaceImplementationWriter;
-import org.apache.axis2.wsdl.codegen.writer.InterfaceWriter;
-import org.apache.axis2.wsdl.codegen.writer.MessageReceiverWriter;
-import org.apache.axis2.wsdl.codegen.writer.SchemaWriter;
-import org.apache.axis2.wsdl.codegen.writer.ServiceXMLWriter;
-import org.apache.axis2.wsdl.codegen.writer.SkeletonInterfaceWriter;
-import org.apache.axis2.wsdl.codegen.writer.SkeletonWriter;
-import org.apache.axis2.wsdl.codegen.writer.TestClassWriter;
-import org.apache.axis2.wsdl.codegen.writer.WSDL11Writer;
-import org.apache.axis2.wsdl.codegen.writer.WSDL20Writer;
+import org.apache.axis2.wsdl.codegen.writer.*;
 import org.apache.axis2.wsdl.databinding.TypeMapper;
-import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
-import org.apache.axis2.wsdl.util.Constants;
-import org.apache.axis2.wsdl.util.XSLTIncludeResolver;
-import org.apache.axis2.wsdl.util.MessagePartInformationHolder;
-import org.apache.axis2.wsdl.util.TypeTesterUtil;
+import org.apache.axis2.wsdl.util.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.commons.schema.XmlSchema;
@@ -63,6 +22,21 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.Text;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.*;
 //import com.ibm.wsdl.util.xml.DOM2Writer;
 
 /*

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?view=diff&rev=442111&r1=442110&r2=442111
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
Sun Sep 10 23:24:57 2006
@@ -827,6 +827,14 @@
 
             private <xsl:value-of select="@type"/> faultMessage;
 
+            public <xsl:value-of select="@shortName"/>(String s) {
+               super(s);
+            }
+
+            public <xsl:value-of select="@shortName"/>(String s, Throwable ex) {
+              super(s, ex);
+            }
+
             public void setFaultMessage(<xsl:value-of select="@type"/> msg){
                faultMessage = msg;
             }
@@ -834,6 +842,9 @@
             public <xsl:value-of select="@type"/> getFaultMessage(){
                return faultMessage;
             }
+
+
+
          }
    </xsl:for-each>
 

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?view=diff&rev=442111&r1=442110&r2=442111
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
Sun Sep 10 23:24:57 2006
@@ -148,9 +148,11 @@
         }
         <xsl:for-each select="fault-list/fault">
             <xsl:if test="position()=1">}</xsl:if>catch (<xsl:value-of select="@name"/>
e) {
-            org.apache.axis2.AxisFault f =
-            new org.apache.axis2.AxisFault("<xsl:value-of select="@shortName"/>");
+
+            org.apache.axis2.AxisFault f = createAxisFault(e);
+
             f.setDetail(toOM(e.getFaultMessage(),false));
+
             throw f;
             }
         </xsl:for-each>
@@ -176,7 +178,17 @@
         return returnMap;
         }
 
+        private org.apache.axis2.AxisFault createAxisFault(java.rmi.RemoteException e) {
+        org.apache.axis2.AxisFault f;
+        Throwable cause = e.getCause();
+        if (cause != null) {
+            f = new org.apache.axis2.AxisFault(e.getMessage(), cause);
+        } else {
+            f = new org.apache.axis2.AxisFault(e.getMessage());
+        }
 
+        return f;
+    }
 
         }//end of class
     </xsl:template>

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl?view=diff&rev=442111&r1=442110&r2=442111
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
Sun Sep 10 23:24:57 2006
@@ -56,6 +56,18 @@
 
             private <xsl:value-of select="@type"/> faultMessage;
 
+            public <xsl:value-of select="@shortName"/>() {
+                super("<xsl:value-of select="@shortName"/>");
+            }
+
+            public <xsl:value-of select="@shortName"/>(String s) {
+               super(s);
+            }
+
+            public <xsl:value-of select="@shortName"/>(String s, Throwable ex) {
+              super(s, ex);
+            }
+
             public void setFaultMessage(<xsl:value-of select="@type"/> msg){
                faultMessage = msg;
             }
@@ -63,6 +75,8 @@
             public <xsl:value-of select="@type"/> getFaultMessage(){
                return faultMessage;
             }
+
+
          }
    </xsl:for-each>
          }

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl?view=diff&rev=442111&r1=442110&r2=442111
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
(original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
Sun Sep 10 23:24:57 2006
@@ -65,13 +65,29 @@
 
                 private <xsl:value-of select="@type"/> faultMessage;
 
+                public <xsl:value-of select="@shortName"/>() {
+                   super("<xsl:value-of select="@shortName"/>");
+                }
+
+                public <xsl:value-of select="@shortName"/>(String s, <xsl:value-of
select="@type"/> msg) {
+                   super(s);
+                   faultMessage = msg;
+                }
+
+                public <xsl:value-of select="@shortName"/>(String s, <xsl:value-of
select="@type"/> msg, Throwable ex) {
+                  super(s, ex);
+                  faultMessage = msg;
+                }
+
                 public void setFaultMessage(<xsl:value-of select="@type"/> msg){
-                faultMessage = msg;
+                    faultMessage = msg;
                 }
 
                 public <xsl:value-of select="@type"/> getFaultMessage(){
-                return faultMessage;
+                   return faultMessage;
                 }
+
+
                 }
             </xsl:for-each>
         </xsl:if>

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?view=diff&rev=442111&r1=442110&r2=442111
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
Sun Sep 10 23:24:57 2006
@@ -263,6 +263,8 @@
             try {
                 zin = new ZipInputStream(new FileInputStream(serviceFile));
 
+                //TODO Check whether this WSDL is empty
+
                 ZipEntry entry;
                 byte[] buf = new byte[1024];
                 int read;

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=442111&r1=442110&r2=442111
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Sun Sep 10 23:24:57 2006
@@ -1187,7 +1187,7 @@
 
     /**
      * To create an AxisService using given service impl class name
-     * fisrt generate schema corresponding to the given java class , next for each methods
AxisOperation
+     * first generate schema corresponding to the given java class , next for each methods
AxisOperation
      * will be created.
      * <p/>
      * Note : Inorder to work this properly RPCMessageReceiver should be availble in the
class path



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message