axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r360566 - in /webservices/axis2/trunk/java/modules: codegen/src/org/apache/axis2/schema/ codegen/src/org/apache/axis2/schema/writer/ codegen/src/org/apache/axis2/util/ codegen/src/org/apache/axis2/wsdl/codegen/extension/ codegen/test/org/ap...
Date Sun, 01 Jan 2006 21:56:55 GMT
Author: dims
Date: Sun Jan  1 13:56:38 2006
New Revision: 360566

URL: http://svn.apache.org/viewcvs?rev=360566&view=rev
Log:
Better namespace generation for the databinding/generated code.

TODO:
- Add options to specify namespace<->package binding
- When "-p" is not present then look at the target namespace for the web service itself and generate a namespace.


Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/CompilerOptions.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/util/URLProcessor.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateAnonComplexTypeTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateArrayInArrayTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateArrayTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeBytePopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeIntPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeIntegerPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeLongPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNegativeIntegerPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNonNegativeIntegerPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNonPositiveIntegerPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypePositveIntegerPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeShortPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedBytePopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedIntPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedLongPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedShortPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeAnyURIPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeBase64BinPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeBooleanPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDatePopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDateTimePopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDayPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDoublePopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDurationPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeFloatPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeHexBinaryPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeMonthDayPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeQNamePopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeTimePopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegMonthPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegYearMonthPopulateTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegYearPopulateTest.java
    webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/JavaUtils.java
    webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
    webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java
    webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/CompilerOptions.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/CompilerOptions.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/CompilerOptions.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/CompilerOptions.java Sun Jan  1 13:56:38 2006
@@ -67,14 +67,12 @@
     }
 
     public CompilerOptions setPackageName(String packageName) {
-        //validate the package name
-        //should be ***.***.***. type value
+        // Validate the package name.
         if (packageName != null && testValue(packageName)) {
             this.packageName = packageName;
         } else {
             throw new RuntimeException("Unsupported value!");
         }
-
         return this;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java Sun Jan  1 13:56:38 2006
@@ -226,7 +226,7 @@
      */
     private String process(QName qName, BeanWriterMetaInfoHolder metainf, Map typeMap, boolean isElement) throws Exception {
 
-        String nameSpaceFromURL = URLProcessor.getNameSpaceFromURL(qName.getNamespaceURI());
+        String nameSpaceFromURL = URLProcessor.makePackageName(qName.getNamespaceURI());
 
         String packageName = this.packageName == null ?
                 nameSpaceFromURL :

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/util/URLProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/util/URLProcessor.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/util/URLProcessor.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/util/URLProcessor.java Sun Jan  1 13:56:38 2006
@@ -18,38 +18,119 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.StringTokenizer;
+import java.net.MalformedURLException;
 
 public class URLProcessor {
-    public static final String DEFAULT_PACKAGE = "axis2";
+    public static final String DEFAULT_PACKAGE = "org.apache.axis2";
 
     /**
-     * Breaks a given url to a package
-     * e.g. http://www.google.com/test will become
-     * com.google.www
+     * Method makePackageName
      *
-     * @param url
+     * @param namespace
      * @return
      */
-    public static String getNameSpaceFromURL(String url) {
-        String returnPackageName = "";
-        String regularExpression = "//[\\w\\.]*";
-        Pattern urlBreaker = Pattern.compile(regularExpression);
-        Matcher matcher = urlBreaker.matcher(url);
-        if (matcher.find()) {
-            String s = matcher.group();
-            s = s.replaceAll("//", "");
-            String[] arrayOfItems = s.split("\\.");
-            int length = arrayOfItems.length;
-            for (int i = length; i > 0; i--) {
-                returnPackageName =
-                        returnPackageName.concat(
-                                (i == length ? "" : ".") + arrayOfItems[i - 1]);
+    public static String makePackageName(String namespace) {
+
+        String hostname = null;
+        String path = "";
+
+        // get the target namespace of the document
+        try {
+            java.net.URL u = new java.net.URL(namespace);
+
+            hostname = u.getHost();
+            path = u.getPath();
+        } catch (MalformedURLException e) {
+            if (namespace.indexOf(":") > -1) {
+                hostname = namespace.substring(namespace.indexOf(":") + 1);
+
+                if (hostname.indexOf("/") > -1) {
+                    hostname = hostname.substring(0, hostname.indexOf("/"));
+                }
+            } else {
+                hostname = namespace;
             }
-        } else {
-            returnPackageName = DEFAULT_PACKAGE;
         }
 
-        return returnPackageName;
+        // if we didn't file a hostname, bail
+        if (hostname == null) {
+            return null;
+        }
+
+        // convert illegal java identifier
+        hostname = hostname.replace('-', '_');
+        path = path.replace('-', '_');
+
+        // chomp off last forward slash in path, if necessary
+        if ((path.length() > 0) && (path.charAt(path.length() - 1) == '/')) {
+            path = path.substring(0, path.length() - 1);
+        }
+
+        // tokenize the hostname and reverse it
+        StringTokenizer st = new StringTokenizer(hostname, ".:");
+        String[] words = new String[st.countTokens()];
+
+        for (int i = 0; i < words.length; ++i) {
+            words[i] = st.nextToken();
+        }
+
+        StringBuffer sb = new StringBuffer(namespace.length());
+
+        for (int i = words.length - 1; i >= 0; --i) {
+            addWordToPackageBuffer(sb, words[i], (i == words.length - 1));
+        }
+
+        // tokenize the path
+        StringTokenizer st2 = new StringTokenizer(path, "/");
+
+        while (st2.hasMoreTokens()) {
+            addWordToPackageBuffer(sb, st2.nextToken(), false);
+        }
+
+        return sb.toString().toLowerCase();
     }
 
+
+    /**
+     * Massage <tt>word</tt> into a form suitable for use in a Java package name.
+     * Append it to the target string buffer with a <tt>.</tt> delimiter iff
+     * <tt>word</tt> is not the first word in the package name.
+     *
+     * @param sb        the buffer to append to
+     * @param word      the word to append
+     * @param firstWord a flag indicating whether this is the first word
+     */
+    private static void addWordToPackageBuffer(StringBuffer sb, String word,
+                                               boolean firstWord) {
+
+        if (JavaUtils.isJavaKeyword(word)) {
+            word = JavaUtils.makeNonJavaKeyword(word);
+        }
+
+        // separate with dot after the first word
+        if (!firstWord) {
+            sb.append('.');
+        }
+
+        // prefix digits with underscores
+        if (Character.isDigit(word.charAt(0))) {
+            sb.append('_');
+        }
+
+        // replace periods with underscores
+        if (word.indexOf('.') != -1) {
+            char[] buf = word.toCharArray();
+
+            for (int i = 0; i < word.length(); i++) {
+                if (buf[i] == '.') {
+                    buf[i] = '_';
+                }
+            }
+
+            word = new String(buf);
+        }
+
+        sb.append(word);
+    }
 }

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java Sun Jan  1 13:56:38 2006
@@ -29,7 +29,7 @@
                     AxisBindingBuilder.AXIS_BINDING_QNAME);
             String temp = binding.getBoundInterface().getName()
                     .getNamespaceURI();
-            packageName = URLProcessor.getNameSpaceFromURL(temp);
+            packageName = URLProcessor.makePackageName(temp);
         }
 
         if (null == packageName || "".equals(packageName))

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java Sun Jan  1 13:56:38 2006
@@ -42,8 +42,6 @@
  */
 public class SimpleDBExtension extends AbstractDBProcessingExtension {
 
-    public static final String ADB_PACKAGE_NAME_PREFIX = "adb.";
-
     public void engage() {
         //test the databinding type. If not just fall through
         if (testFallthrough(configuration.getDatabindingType())) {
@@ -182,7 +180,6 @@
     private void setDefaultOptions(CompilerOptions options) {
         /// these options need to be taken from the command line
         options.setOutputLocation(configuration.getOutputLocation());
-        options.setPackageName(ADB_PACKAGE_NAME_PREFIX);
 
         //default setting is to set the wrap status depending on whether it's
         //the server side or the client side

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java Sun Jan  1 13:56:38 2006
@@ -21,6 +21,7 @@
 import org.apache.axis2.wsdl.databinding.DefaultTypeMapper;
 import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
 import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
+import org.apache.axis2.util.URLProcessor;
 import org.apache.wsdl.WSDLBinding;
 import org.apache.wsdl.WSDLBindingMessageReference;
 import org.apache.wsdl.WSDLBindingOperation;
@@ -62,8 +63,6 @@
 import java.util.Map;
 import java.util.Stack;
 import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class XMLBeansExtension extends AbstractDBProcessingExtension {
     public static final String SCHEMA_FOLDER = "schemas";
@@ -378,31 +377,9 @@
      * how the namespaces are suffixed/prefixed
      */
     private class Axis2BindingConfig extends BindingConfig {
-        Pattern pattern = Pattern.compile("//[\\w\\.]*");
-        private static final String DATABINDING_PACKAGE_SUFFIX = "databinding";
-
         public String lookupPackageForNamespace(String uri) {
-            //take the **.**.** part from the uri
-            Matcher matcher = pattern.matcher(uri);
-            String packageName = "";
-            if (matcher.find()) {
-                String tempPackageName = matcher.group().replaceFirst("//", "");
-                //reverse the names
-                String[] parts = tempPackageName.split("\\.");
-                for (int i = parts.length - 1; i >= 0; i--) {
-                    packageName = packageName + "." + parts[i];
-
-                }
-
-            } else {
-                //replace all none word chars with an underscore
-                packageName = uri.replaceAll("\\W", "_");
-            }
-
-            return configuration.getPackageName() == null ? "" : (configuration.getPackageName() + ".") + DATABINDING_PACKAGE_SUFFIX + packageName;
+            return URLProcessor.makePackageName(uri);
         }
-
     }
-
 }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateAnonComplexTypeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateAnonComplexTypeTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateAnonComplexTypeTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateAnonComplexTypeTest.java Sun Jan  1 13:56:38 2006
@@ -37,7 +37,7 @@
     public void testPopulate() throws Exception{
 
         XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(xmlString.getBytes()));
-        Class clazz = Class.forName("org1.soapinterop.tempElt");
+        Class clazz = Class.forName("org1.soapinterop.types.TempElt");
         Method parseMethod = clazz.getMethod("parse",new Class[]{XMLStreamReader.class});
         Object obj = parseMethod.invoke(null,new Object[]{reader});
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateArrayInArrayTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateArrayInArrayTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateArrayInArrayTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateArrayInArrayTest.java Sun Jan  1 13:56:38 2006
@@ -48,7 +48,7 @@
     public void testPopulate() throws Exception{
 
             XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(xmlString.getBytes()));
-            Class clazz = Class.forName("org.soapinterop.myobject");
+            Class clazz = Class.forName("org.soapinterop.xsd.Myobject");
             Method parseMethod = clazz.getMethod("parse",new Class[]{XMLStreamReader.class});
             Object obj = parseMethod.invoke(null,new Object[]{reader});
 
@@ -68,19 +68,5 @@
             }
 
             assertNotNull(myObject);
-
-//            int length = Array.getLength(myObject);
-//            for (int i = 0; i < length; i++) {
-//                System.out.println(Array.get(myObject,i));
-//
-//            }
-
-
-
-
-
     }
-
-
-
 }

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateArrayTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateArrayTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateArrayTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/PopulateArrayTest.java Sun Jan  1 13:56:38 2006
@@ -38,7 +38,7 @@
     public void testPopulate() throws Exception{
 
         XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(xmlString.getBytes()));
-        Class clazz = Class.forName("org2.soapinterop.myobject");
+        Class clazz = Class.forName("org2.soapinterop.xsd.Myobject");
         Method parseMethod = clazz.getMethod("parse",new Class[]{XMLStreamReader.class});
         Object obj = parseMethod.invoke(null,new Object[]{reader});
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeBytePopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeBytePopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeBytePopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeBytePopulateTest.java Sun Jan  1 13:56:38 2006
@@ -32,7 +32,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedByte";
+        className = "org.soapinterop.xsd.DerivedByte";
         propertyClass = byte.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeIntPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeIntPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeIntPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeIntPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -33,7 +33,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedInt";
+        className = "org.soapinterop.xsd.DerivedInt";
         propertyClass = int.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeIntegerPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeIntegerPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeIntegerPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeIntegerPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -34,7 +34,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedInteger";
+        className = "org.soapinterop.xsd.DerivedInteger";
         propertyClass = BigInteger.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeLongPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeLongPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeLongPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeLongPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -40,7 +40,7 @@
 
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedLong";
+        className = "org.soapinterop.xsd.DerivedLong";
         propertyClass = long.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNegativeIntegerPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNegativeIntegerPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNegativeIntegerPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNegativeIntegerPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -37,7 +37,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedNegativeInteger";
+        className = "org.soapinterop.xsd.DerivedNegativeInteger";
         propertyClass = NegativeInteger.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNonNegativeIntegerPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNonNegativeIntegerPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNonNegativeIntegerPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNonNegativeIntegerPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -42,7 +42,7 @@
 
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedNonNegativeInteger";
+        className = "org.soapinterop.xsd.DerivedNonNegativeInteger";
         propertyClass = NonNegativeInteger.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNonPositiveIntegerPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNonPositiveIntegerPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNonPositiveIntegerPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeNonPositiveIntegerPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -42,7 +42,7 @@
 
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedNonPositiveInteger";
+        className = "org.soapinterop.xsd.DerivedNonPositiveInteger";
         propertyClass = long.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypePositveIntegerPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypePositveIntegerPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypePositveIntegerPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypePositveIntegerPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -42,7 +42,7 @@
 
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedPositiveInteger";
+        className = "org.soapinterop.xsd.DerivedPositiveInteger";
         propertyClass = PositiveInteger.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeShortPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeShortPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeShortPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeShortPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -41,7 +41,7 @@
 
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedShort";
+        className = "org.soapinterop.xsd.DerivedShort";
         propertyClass = Short.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedBytePopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedBytePopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedBytePopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedBytePopulateTest.java Sun Jan  1 13:56:38 2006
@@ -42,7 +42,7 @@
 
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedUnsignedByte";
+        className = "org.soapinterop.xsd.DerivedUnsignedByte";
         propertyClass = UnsignedByte.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedIntPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedIntPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedIntPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedIntPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -42,7 +42,7 @@
 
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedUnsignedInt";
+        className = "org.soapinterop.xsd.DerivedUnsignedInt";
         propertyClass = UnsignedInt.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedLongPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedLongPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedLongPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedLongPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -42,7 +42,7 @@
 
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedUnsignedLong";
+        className = "org.soapinterop.xsd.DerivedUnsignedLong";
         propertyClass = UnsignedLong.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedShortPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedShortPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedShortPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/derived/DerivedTypeUnsignedShortPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -42,7 +42,7 @@
 
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.DerivedUnsignedShort";
+        className = "org.soapinterop.xsd.DerivedUnsignedShort";
         propertyClass = UnsignedShort.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeAnyURIPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeAnyURIPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeAnyURIPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeAnyURIPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -28,7 +28,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.anyURIParam";
+        className = "org.soapinterop.xsd.AnyURIParam";
         propertyClass = URI.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeBase64BinPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeBase64BinPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeBase64BinPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeBase64BinPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -23,12 +23,12 @@
     };
 
      protected void setUp() throws Exception {
-        className = "org.soapinterop.base64BinParam";
+        className = "org.soapinterop.xsd.Base64BinParam";
         propertyClass = byte[].class;
     }
     // force others to implement this method
     public void testPopulate() throws Exception {
-        process(xmlString[0],"org.soapinterop.base64BinParam");
-        process(xmlString[1],"org.soapinterop.base64BinParam");
+        process(xmlString[0],"org.soapinterop.xsd.Base64BinParam");
+        process(xmlString[1],"org.soapinterop.xsd.Base64BinParam");
     }
 }

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeBooleanPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeBooleanPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeBooleanPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeBooleanPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -28,7 +28,7 @@
     };
 
     protected void setUp() throws Exception {
-        className ="org.soapinterop.booleanParam";
+        className ="org.soapinterop.xsd.BooleanParam";
         propertyClass = boolean.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDatePopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDatePopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDatePopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDatePopulateTest.java Sun Jan  1 13:56:38 2006
@@ -32,7 +32,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.dateParam";
+        className = "org.soapinterop.xsd.DateParam";
         propertyClass = java.util.Date.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDateTimePopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDateTimePopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDateTimePopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDateTimePopulateTest.java Sun Jan  1 13:56:38 2006
@@ -37,7 +37,7 @@
     }
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.dateTimeParam";
+        className = "org.soapinterop.xsd.DateTimeParam";
         propertyClass = Calendar.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDayPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDayPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDayPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDayPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -31,7 +31,7 @@
     };
 
     protected void setUp() throws Exception {
-        className ="org.soapinterop.dayParam";
+        className ="org.soapinterop.xsd.DayParam";
         propertyClass = Day.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDoublePopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDoublePopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDoublePopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDoublePopulateTest.java Sun Jan  1 13:56:38 2006
@@ -30,7 +30,7 @@
     };
 
     protected void setUp() throws Exception {
-       className = "org.soapinterop.doubleParam";
+       className = "org.soapinterop.xsd.DoubleParam";
        propertyClass = float.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDurationPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDurationPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDurationPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeDurationPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -32,7 +32,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.durationParam";
+        className = "org.soapinterop.xsd.DurationParam";
         propertyClass = Duration.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeFloatPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeFloatPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeFloatPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeFloatPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -34,7 +34,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.floatParam";
+        className = "org.soapinterop.xsd.FloatParam";
         propertyClass = float.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeHexBinaryPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeHexBinaryPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeHexBinaryPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeHexBinaryPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -32,7 +32,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.hexBinParam";
+        className = "org.soapinterop.xsd.HexBinParam";
         propertyClass = HexBinary.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeMonthDayPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeMonthDayPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeMonthDayPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeMonthDayPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -32,7 +32,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.monthDayParam";
+        className = "org.soapinterop.xsd.MonthDayParam";
         propertyClass = MonthDay.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeQNamePopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeQNamePopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeQNamePopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeQNamePopulateTest.java Sun Jan  1 13:56:38 2006
@@ -23,8 +23,8 @@
     };
     // force others to implement this method
     public void testPopulate() throws Exception {
-        process(xmlString[0],"org.soapinterop.qNameParam");
-        process(xmlString[1],"org.soapinterop.qNameParam");
+        process(xmlString[0],"org.soapinterop.xsd.QNameParam");
+        process(xmlString[1],"org.soapinterop.xsd.QNameParam");
        // process(xmlString[2],"org.soapinterop.qNameParam");
     }
 }

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeTimePopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeTimePopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeTimePopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypeTimePopulateTest.java Sun Jan  1 13:56:38 2006
@@ -29,7 +29,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.timeParam";
+        className = "org.soapinterop.xsd.TimeParam";
         propertyClass = Time.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegMonthPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegMonthPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegMonthPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegMonthPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -35,7 +35,7 @@
 
 
      protected void setUp() throws Exception {
-        className = "org.soapinterop.monthParam";
+        className = "org.soapinterop.xsd.MonthParam";
         propertyClass = Month.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegYearMonthPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegYearMonthPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegYearMonthPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegYearMonthPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -32,7 +32,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.yearMonthParam";
+        className = "org.soapinterop.xsd.YearMonthParam";
         propertyClass = YearMonth.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegYearPopulateTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegYearPopulateTest.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegYearPopulateTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/schema/populate/simple/SimpleTypegYearPopulateTest.java Sun Jan  1 13:56:38 2006
@@ -32,7 +32,7 @@
     };
 
     protected void setUp() throws Exception {
-        className = "org.soapinterop.yearParam";
+        className = "org.soapinterop.xsd.YearParam";
         propertyClass = Year.class;
     }
 

Modified: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/JavaUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/JavaUtils.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/JavaUtils.java (original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/JavaUtils.java Sun Jan  1 13:56:38 2006
@@ -19,6 +19,8 @@
 import java.text.Collator;
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.StringTokenizer;
+import java.net.MalformedURLException;
 
 /**
  * JavaUtils

Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java (original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java Sun Jan  1 13:56:38 2006
@@ -1,11 +1,9 @@
+package org.apache.axis2.oasis.ping;
 
-    package org.apache.axis2.oasis.ping;
-
-
-    import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingDocument;
-    import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingResponse;
-import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingResponseDocument;
+import org.apache.axis2.context.MessageContext;
+import org.xmlsoap.ping.PingDocument;
+import org.xmlsoap.ping.PingResponse;
+import org.xmlsoap.ping.PingResponseDocument;
 import org.apache.ws.security.WSConstants;
 import org.apache.ws.security.WSSecurityEngineResult;
 import org.apache.ws.security.handler.WSHandlerConstants;
@@ -13,50 +11,49 @@
 
 import java.util.Vector;
 
+/**
+ * Auto generated java skeleton for the service by the Axis code generator
+ */
+public class PingPortSkeleton {
+
+    private MessageContext mc;
+
+    public void init(MessageContext mc) {
+        this.mc = mc;
+    }
+
     /**
-     *  Auto generated java skeleton for the service by the Axis code generator
+     * Auto generated method signature
+     *
+     * @param param0
      */
-    public class PingPortSkeleton {
-
-    	private MessageContext mc;
-    	
-    	public void init(MessageContext mc) {
-    		this.mc = mc;
-    	}
-
-        /**
-         * Auto generated method signature
-
-          * @param param0
-
-         */
-        public  PingResponseDocument Ping
-                  (PingDocument param0 ){
-        	Vector results = null;
-            if ((results =
+    public PingResponseDocument Ping
+            (PingDocument param0) {
+        Vector results = null;
+        if ((results =
                 (Vector) mc.getProperty(WSHandlerConstants.RECV_RESULTS))
                 == null) {
-                System.out.println("No security results!!");
-            }
-            System.out.println("Number of results: " + results.size());
-            for (int i = 0; i < results.size(); i++) {
-                WSHandlerResult rResult =
+            System.out.println("No security results!!");
+        }
+        System.out.println("Number of results: " + results.size());
+        for (int i = 0; i < results.size(); i++) {
+            WSHandlerResult rResult =
                     (WSHandlerResult) results.get(i);
-                Vector wsSecEngineResults = rResult.getResults();
+            Vector wsSecEngineResults = rResult.getResults();
 
-                for (int j = 0; j < wsSecEngineResults.size(); j++) {
-                    WSSecurityEngineResult wser =
+            for (int j = 0; j < wsSecEngineResults.size(); j++) {
+                WSSecurityEngineResult wser =
                         (WSSecurityEngineResult) wsSecEngineResults.get(j);
-                    if (wser.getAction() != WSConstants.ENCR && wser.getPrincipal() != null) {
-                        System.out.println(wser.getPrincipal().getName());
-                    }
+                if (wser.getAction() != WSConstants.ENCR && wser.getPrincipal() != null) {
+                    System.out.println(wser.getPrincipal().getName());
                 }
             }
-        	PingResponseDocument response = PingResponseDocument.Factory.newInstance();
-            PingResponse pingRes = response.addNewPingResponse();
-            pingRes.setText("Response: " + param0.getPing().getText());
-            return response;
         }
-
+        PingResponseDocument response = PingResponseDocument.Factory.newInstance();
+        PingResponse pingRes = response.addNewPingResponse();
+        pingRes.setText("Response: " + param0.getPing().getText());
+        return response;
     }
+
+}
     

Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java (original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/InteropScenarioClient.java Sun Jan  1 13:56:38 2006
@@ -18,11 +18,11 @@
 
 import org.apache.axis2.Constants;
 import org.apache.axis2.oasis.ping.PingPortStub;
-import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.Ping;
-import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingDocument;
-import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingResponse;
-import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.PingResponseDocument;
-import org.apache.axis2.oasis.ping.databinding.org.xmlsoap.TicketType;
+import org.xmlsoap.ping.Ping;
+import org.xmlsoap.ping.PingDocument;
+import org.xmlsoap.ping.PingResponse;
+import org.xmlsoap.ping.PingResponseDocument;
+import org.xmlsoap.ping.TicketType;
 import org.apache.axis2.security.handler.WSSHandlerConstants;
 import org.apache.axis2.security.handler.config.InflowConfiguration;
 import org.apache.axis2.security.handler.config.OutflowConfiguration;

Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java?rev=360566&r1=360565&r2=360566&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/codegen/eclipse/ui/OptionsPage.java Sun Jan  1 13:56:38 2006
@@ -200,7 +200,7 @@
       String storedPackageName = settings.get(PREF_PACKAGE_NAME);
       if (storedPackageName.equals(""))
       {
-         packageName = URLProcessor.getNameSpaceFromURL("");
+         packageName = URLProcessor.makePackageName("");
       }
       else
       {



Mime
View raw message