Author: jsdelfino
Date: Sat May  6 12:03:53 2006
New Revision: 400351

URL: http://svn.apache.org/viewcvs?rev=400351&view=rev
Log:
Fix for TUSCANY-267 - ported tools to Axis2 1.0

Modified:
    incubator/tuscany/java/sca/tools/pom.xml
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLModel.java
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
    
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
    
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/Account.java
    
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/Customer.java
    
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
    
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
    
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WsdlTestCase.java

Modified: incubator/tuscany/java/sca/tools/pom.xml
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/pom.xml?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/pom.xml Sat May  6 12:03:53 2006
@@ -74,21 +74,21 @@
         <dependency>
             <groupId>axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
-            <version>0.95</version>
+            <version>1.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
-            <version>0.95</version>
+            <version>1.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-wsdl4j</artifactId>
-            <version>1.2</version>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>1.5.2</version>
             <scope>compile</scope>
         </dependency>
 
@@ -115,13 +115,13 @@
         <dependency>
             <groupId>ws-commons</groupId>
             <artifactId>axiom-api</artifactId>
-            <version>0.95</version>
+            <version>1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>ws-commons</groupId>
             <artifactId>axiom-impl</artifactId>
-            <version>0.95</version>
+            <version>1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -133,14 +133,14 @@
         <dependency>
             <groupId>woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>2.8.2</version>
+            <version>2.9.3</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>ws-commons</groupId>
+            <groupId>org.apache.ws.commons</groupId>
             <artifactId>XmlSchema</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0.2</version>
             <scope>compile</scope>
         </dependency>
 

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
 Sat May  6 12:03:53 2006
@@ -1,3 +1,19 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate; 
 
 import java.io.File;
@@ -12,8 +28,6 @@
 import org.apache.ws.java2wsdl.Java2WSDLConstants;
 import org.apache.ws.java2wsdl.Java2WSDLUtils;
 import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
-
-
 
 /**
  * This class encapsulates the parameters that effect the generation of the 

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
 Sat May  6 12:03:53 2006
@@ -1,7 +1,23 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate; 
 
-import org.apache.ws.java2wsdl.utils.Java2WSDLOptionsValidator;
 import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOptionParser;
+import org.apache.ws.java2wsdl.utils.Java2WSDLOptionsValidator;
 
 /**
  * This class provides the tooling abstraction to Tuscany Java2WSDL and can be
@@ -29,14 +45,14 @@
        }
 
        private static void runAxis2Tool(String[] args) {
-               org.apache.axis2.wsdl.Java2WSDL.main(args);
+               org.apache.ws.java2wsdl.Java2WSDL.main(args);
        }
        
         private static void 
validateCommandLineOptions(Java2WSDLCommandLineOptionParser parser) {
                if (parser.getAllOptions().size() == 0) {
-                       org.apache.axis2.wsdl.Java2WSDL.printUsage();
+                org.apache.ws.java2wsdl.Java2WSDL.printUsage();
                } else if (parser.getInvalidOptions(new 
Java2WSDLOptionsValidator()).size() > 0) {
-                       org.apache.axis2.wsdl.Java2WSDL.printUsage();
+                org.apache.ws.java2wsdl.Java2WSDL.printUsage();
                }
 
            }

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
 Sat May  6 12:03:53 2006
@@ -1,3 +1,19 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate;
 
 import java.io.OutputStream;

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
 Sat May  6 12:03:53 2006
@@ -1,5 +1,18 @@
 /**
- * 
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
 package org.apache.tuscany.tools.java2wsdl.generate;
 
@@ -9,7 +22,7 @@
 import java.util.Map;
 import java.util.Vector;
 
-import org.apache.axis2.wsdl.Java2WSDL;
+import org.apache.ws.java2wsdl.Java2WSDL;
 import org.apache.axis2.wsdl.util.CommandLineOption;
 import org.apache.axis2.wsdl.util.CommandLineOptionParser;
 import org.apache.axis2.wsdl.util.Java2WSDLOptionsValidator;

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
 Sat May  6 12:03:53 2006
@@ -1,3 +1,19 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate;
 
 import java.io.ByteArrayInputStream;
@@ -18,27 +34,9 @@
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaObject;
+import org.apache.ws.java2wsdl.Java2WSDLConstants;
 import org.apache.ws.java2wsdl.utils.TypeTable;
 import org.codehaus.jam.JMethod;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
-
-/*
-* Copyright 2004,2005 The Apache Software Foundation.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-*/
 
 public class TuscanyJava2OMBuilder implements Java2WSDLConstants {
 
@@ -168,12 +166,11 @@
 
     private void writeSchemas(StringWriter writer) {
         Iterator iterator = schemaCollection.iterator();
-        Iterator typeIterator = null;
-        Iterator elementIterator = null;
         XmlSchema xmlSchema = null;
+        //Iterator typeIterator = null;
         while (iterator.hasNext()) {
             xmlSchema = (XmlSchema) iterator.next();
-            typeIterator = xmlSchema.getSchemaTypes().getValues();
+            //typeIterator = xmlSchema.getSchemaTypes().getValues();
             /*while (typeIterator.hasNext()) {
                 xmlSchema.getItems().add((XmlSchemaObject) 
typeIterator.next());
                 
@@ -396,17 +393,17 @@
     }
     }
 
-    private void addExtensionElement(OMFactory fac, OMElement element, String 
name, OMNamespace namespace,
-                                     Hashtable attrs) {
-        OMElement soapbinding = fac.createOMElement(name, namespace);
-        element.addChild(soapbinding);
-        Enumeration enumeration = attrs.keys();
-        String attrName = null;
-        while (enumeration.hasMoreElements()) {
-            attrName = (String) enumeration.nextElement();
-            soapbinding.addAttribute(attrName, (String) attrs.get(attrName), 
null);
-        }
-    }
+//    private void addExtensionElement(OMFactory fac, OMElement element, 
String name, OMNamespace namespace,
+//                                     Hashtable attrs) {
+//        OMElement soapbinding = fac.createOMElement(name, namespace);
+//        element.addChild(soapbinding);
+//        Enumeration enumeration = attrs.keys();
+//        String attrName = null;
+//        while (enumeration.hasMoreElements()) {
+//            attrName = (String) enumeration.nextElement();
+//            soapbinding.addAttribute(attrName, (String) attrs.get(attrName), 
null);
+//        }
+//    }
 
     private void addExtensionElement(OMFactory fac, OMElement element, 
OMNamespace namespace,
                                      String name, String att1Name, String 
att1Value, String att2Name,

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
 Sat May  6 12:03:53 2006
@@ -1,3 +1,19 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate;
 
 import java.io.OutputStream;
@@ -7,24 +23,6 @@
 import org.apache.ws.java2wsdl.Java2WSDLConstants;
 import org.apache.ws.java2wsdl.Java2WSDLUtils;
 import org.apache.ws.java2wsdl.SchemaGenerator;
-import org.apache.ws.java2wsdl.utils.TypeTable;
-/*
-* Copyright 2004,2005 The Apache Software Foundation.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
-*
-*/
 
 public class TuscanyJava2WSDLBuilder {
 
@@ -146,7 +144,7 @@
                        schemaCollection,
                        sg.getTypeTable(),
                 serviceName == null ? 
Java2WSDLUtils.getSimpleClassName(className) : serviceName,
-                targetNamespace == null ? 
Java2WSDLUtils.namespaceFromClassName(className).toString():targetNamespace,
+                targetNamespace == null ? 
Java2WSDLUtils.namespaceFromClassName(className, 
classLoader).toString():targetNamespace,
                 targetNamespacePrefix,
                 style,
                 use,

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
 Sat May  6 12:03:53 2006
@@ -1,3 +1,19 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate;
 
 import java.util.EventObject;

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
 Sat May  6 12:03:53 2006
@@ -1,3 +1,19 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate;
 
 public interface WSDLGenListener {

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLModel.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLModel.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLModel.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLModel.java
 Sat May  6 12:03:53 2006
@@ -1,3 +1,19 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate;
 
 

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
 Sat May  6 12:03:53 2006
@@ -18,18 +18,18 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.xml.namespace.QName;
 
+import org.apache.axis2.description.AxisMessage;
+import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.util.FileWriter;
+import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
 import org.apache.axis2.wsdl.codegen.emitter.JavaEmitter;
 import org.apache.axis2.wsdl.codegen.writer.InterfaceWriter;
 import org.apache.axis2.wsdl.databinding.TypeMapper;
-import org.apache.wsdl.MessageReference;
-import org.apache.wsdl.WSDLExtensibilityAttribute;
-import org.apache.wsdl.WSDLOperation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -38,13 +38,26 @@
  */
 public class JavaInterfaceEmitter extends JavaEmitter {
     
-    private List getParameterElementList(Document doc, MessageReference 
message, boolean wrapped) {
+    private CodeGenConfiguration codegenConfiguration;
+    private TypeMapper typeMapper;
+
+    public void setCodeGenConfiguration(CodeGenConfiguration configuration) {
+        super.setCodeGenConfiguration(configuration);
+        codegenConfiguration=configuration;
+    }
+    
+    public void setMapper(TypeMapper typeMapper) {
+        super.setMapper(typeMapper);
+        this.typeMapper = typeMapper;
+    }
+    
+    private List getParameterElementList(Document doc, AxisMessage message, 
boolean wrapped) {
         List parameterElementList = new ArrayList();
         
         if (message != null && message.getElementQName()!=null) {
 
             SDODataBindingTypeMappingEntry typeMappingEntry =
-                
(SDODataBindingTypeMappingEntry)this.mapper.getTypeMappingObject(message.getElementQName());
+                
(SDODataBindingTypeMappingEntry)this.typeMapper.getTypeMappingObject(message.getElementQName());
             List typeMappings;
             if (wrapped) {
                 typeMappings = (List)typeMappingEntry.getPropertyClassNames();
@@ -59,7 +72,7 @@
                 
                 String typeMapping = (String)typeMappings.get(i);
     
-                addAttribute(doc, "name", 
this.mapper.getParameterName(message.getElementQName()), param);
+                addAttribute(doc, "name", 
this.typeMapper.getParameterName(message.getElementQName()), param);
                 addAttribute(doc, "type", (typeMapping == null)
                         ? ""
                         : typeMapping, param);
@@ -74,13 +87,6 @@
                 // add this as a body parameter
                 addAttribute(doc, "location", "body", param);
     
-                Iterator iter = 
message.getExtensibilityAttributes().iterator();
-    
-                while (iter.hasNext()) {
-                    WSDLExtensibilityAttribute att = 
(WSDLExtensibilityAttribute) iter.next();
-    
-                    addAttribute(doc, att.getKey().getLocalPart(), 
att.getValue().toString(), param);
-                }
             }
         }
 
@@ -97,9 +103,9 @@
                 Element param = doc.createElement("param");
                 QName name = (QName) parameters.get(i);
 
-                addAttribute(doc, "name", this.mapper.getParameterName(name), 
param);
+                addAttribute(doc, "name", 
this.typeMapper.getParameterName(name), param);
 
-                String typeMapping = this.mapper.getTypeMappingName(name);
+                String typeMapping = this.typeMapper.getTypeMappingName(name);
                 String typeMappingStr = (typeMapping == null)
                         ? ""
                         : typeMapping;
@@ -113,15 +119,15 @@
         return parameterElementList;
     }
     
-    protected boolean isWrapped(WSDLOperation operation) {
+    protected boolean isWrapped(AxisOperation operation) {
         boolean wrapped = false;
-        
-        if (operation.getInputMessage() != null) {
-            QName qname = operation.getInputMessage().getElementQName();
+
+        if (isInputPresentForMEP(operation.getMessageExchangePattern())) {
+            QName qname = 
operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).getElementQName();
             if (qname != null && 
qname.getLocalPart().equals(operation.getName().getLocalPart())) {
                 
                 SDODataBindingTypeMappingEntry typeMappingEntry =
-                            
(SDODataBindingTypeMappingEntry)this.mapper.getTypeMappingObject(qname);
+                            
(SDODataBindingTypeMappingEntry)this.typeMapper.getTypeMappingObject(qname);
                 if (typeMappingEntry.isAnonymous()) {
                     wrapped = true;
                 }
@@ -131,15 +137,24 @@
         return wrapped;
     }
 
-    protected Element getInputElement(Document doc, WSDLOperation operation, 
List headerParameterQNameList) {
-        return getElement(doc, "input", operation.getInputMessage(), 
isWrapped(operation), headerParameterQNameList);
+    private boolean isInputPresentForMEP(String MEP) {
+        return WSDLConstants.MEP_URI_IN_ONLY.equals(MEP) ||
+                WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
+                WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
+                WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
+                WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
+                WSDLConstants.MEP_URI_IN_OUT.equals(MEP);
+    }
+
+    protected Element getInputElement(Document doc, AxisOperation operation, 
List headerParameterQNameList) {
+        return getElement(doc, "input", 
operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE), 
isWrapped(operation), headerParameterQNameList);
     }
     
-    protected Element getOutputElement(Document doc, WSDLOperation operation, 
List headerParameterQNameList) {
-        return getElement(doc, "output", operation.getOutputMessage(), 
isWrapped(operation), headerParameterQNameList);
+    protected Element getOutputElement(Document doc, AxisOperation operation, 
List headerParameterQNameList) {
+        return getElement(doc, "output", 
operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE), 
isWrapped(operation), headerParameterQNameList);
     }
 
-    protected Element getElement(Document doc, String elementName, 
MessageReference message, boolean wrapped, List headerParameterQNameList) {
+    protected Element getElement(Document doc, String elementName, AxisMessage 
message, boolean wrapped, List headerParameterQNameList) {
         Element element = doc.createElement(elementName);
 
         List parameterElementList = getParameterElementList(doc, message, 
wrapped);
@@ -155,20 +170,20 @@
 
         return element;
     }
-
+    
     protected void writeInterface(boolean writeDatabinders) throws Exception {
         Document interfaceModel = 
createDOMDocumentForInterface(writeDatabinders);
-        if (!configuration.getOutputLocation().exists()) {
-            configuration.getOutputLocation().mkdirs();
+        if (!codegenConfiguration.getOutputLocation().exists()) {
+            codegenConfiguration.getOutputLocation().mkdirs();
         }
-        InterfaceWriter interfaceWriter = new 
InterfaceWriter(this.configuration
-            .getOutputLocation(), this.configuration.getOutputLanguage());
+        InterfaceWriter interfaceWriter = new 
InterfaceWriter(this.codegenConfiguration
+            .getOutputLocation(), 
this.codegenConfiguration.getOutputLanguage());
 
         String packageName = 
interfaceModel.getDocumentElement().getAttribute("package");
         String className = 
interfaceModel.getDocumentElement().getAttribute("name");
 
         System.out.println(">>  Generating Java class " + packageName + "." + 
className);
-        File outputFile = 
FileWriter.createClassFile(this.configuration.getOutputLocation(),
+        File outputFile = 
FileWriter.createClassFile(this.codegenConfiguration.getOutputLocation(),
                                                      packageName, className, 
".java");
         if (outputFile.exists()) {
             outputFile.delete();

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
 Sat May  6 12:03:53 2006
@@ -17,15 +17,25 @@
 package org.apache.tuscany.tools.wsdl2java.generate;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
 import javax.wsdl.WSDLException;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
 import javax.xml.namespace.QName;
+import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.axis2.wsdl.builder.WOMBuilderFactory;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.WSDL2AxisServiceBuilder;
+import org.apache.axis2.util.XMLUtils;
 import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
 import org.apache.axis2.wsdl.codegen.CodeGenerationException;
 import org.apache.axis2.wsdl.codegen.extension.CodeGenExtension;
@@ -33,9 +43,9 @@
 import org.apache.axis2.wsdl.codegen.extension.PackageFinder;
 import org.apache.axis2.wsdl.codegen.extension.WSDLValidatorExtension;
 import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
-import org.apache.axis2.wsdl.i18n.CodegenMessages;
 import org.apache.tuscany.model.util.XMLNameUtil;
-import org.apache.wsdl.WSDLDescription;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
 
 public class JavaInterfaceGenerator {
 
@@ -44,16 +54,20 @@
 
     public JavaInterfaceGenerator(String uri, String outputLocation, String 
packageName,
                                   Map<QName, SDODataBindingTypeMappingEntry> 
typeMapping) throws CodeGenerationException {
-        WSDLDescription wom;
+        
+        Definition definition;
         try {
-            wom = 
WOMBuilderFactory.getBuilder(org.apache.wsdl.WSDLConstants.WSDL_1_1)
-                .build(uri).getDescription();
+            definition = readInTheWSDLFile(uri);
         } catch (WSDLException e) {
-            throw new 
CodeGenerationException(CodegenMessages.getMessage("engine.wsdlParsingException"),
 e);
+            throw new CodeGenerationException(e);
         }
+        
+        Service 
service=(Service)definition.getServices().values().iterator().next();
+        QName serviceQname = service.getQName();
+        Port port = (Port)service.getPorts().values().iterator().next();
 
         if (packageName == null) {
-            packageName = 
XMLNameUtil.getPackageNameFromNamespace(wom.getTargetNameSpace());
+            packageName = 
XMLNameUtil.getPackageNameFromNamespace(definition.getTargetNamespace());
         }
 
         JavaTypeMapper typeMapper = new JavaTypeMapper();
@@ -61,10 +75,17 @@
             typeMapper.addTypeMappingObject(e.getKey(), e.getValue());
         }
 
-        codegenConfiguration = new CodeGenConfiguration(wom, new HashMap());
+        AxisService axisService;
+        try {
+            axisService = new WSDL2AxisServiceBuilder(definition, 
serviceQname, port.getName()).populateService();
+        } catch (AxisFault e) {
+            throw new CodeGenerationException(e);
+        }
+
+        codegenConfiguration= new CodeGenConfiguration(Collections.EMPTY_MAP);
+        codegenConfiguration.setAxisService(axisService);
         codegenConfiguration.setAdvancedCodeGenEnabled(false);
         codegenConfiguration.setAsyncOn(false);
-        codegenConfiguration.setCodeGenerationStyle(0);
         codegenConfiguration.setDatabindingType("sdo");
         codegenConfiguration.setGenerateAll(true);
         codegenConfiguration.setGenerateDeployementDescriptor(false);
@@ -72,10 +93,10 @@
         codegenConfiguration.setOutputLocation(new File(outputLocation));
         codegenConfiguration.setPackageName(packageName);
         codegenConfiguration.setPackClasses(false);
-        codegenConfiguration.setPolicyMap(new HashMap());
-        codegenConfiguration.setPortName(null);
+        codegenConfiguration.setPolicyMap(Collections.EMPTY_MAP);
+        codegenConfiguration.setPortName(port.getName());
         codegenConfiguration.setServerSide(false);
-        codegenConfiguration.setServiceName(null);
+        codegenConfiguration.setServiceName(service.getQName().getLocalPart());
         codegenConfiguration.setSyncOn(true);
         codegenConfiguration.setTypeMapper(typeMapper);
         codegenConfiguration.setWriteMessageReceiver(false);
@@ -108,6 +129,55 @@
         } catch (Exception e) {
             throw new CodeGenerationException(e);
         }
+    }
+
+    /**
+     * Read the WSDL file
+     * @param uri
+     * @return
+     * @throws WSDLException
+     */
+    private Definition readInTheWSDLFile(String uri) throws WSDLException {
+
+        WSDLReader reader =
+                WSDLFactory.newInstance().newWSDLReader();
+        reader.setFeature("javax.wsdl.importDocuments", true);
+
+        File file = new File(uri);
+        String baseURI;
+
+        if (uri.startsWith("http://";)){
+            baseURI = uri;
+        } else{
+            if(file.getParentFile() == null){
+               try {
+                    baseURI = new 
File(".").getCanonicalFile().toURI().toString();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
+                baseURI = file.getParentFile().toURI().toString();
+            }
+        }
+
+
+        Document doc;
+        try {
+            doc = XMLUtils.newDocument(uri);
+        } catch (ParserConfigurationException e) {
+            throw new WSDLException(WSDLException.PARSER_ERROR,
+                    "Parser Configuration Error",
+                    e);
+        } catch (SAXException e) {
+            throw new WSDLException(WSDLException.PARSER_ERROR,
+                    "Parser SAX Error",
+                    e);
+
+        } catch (IOException e) {
+            throw new WSDLException(WSDLException.INVALID_WSDL, "IO Error", e);
+        }
+
+        return reader.readWSDL(baseURI, doc);
     }
 
 }

Modified: 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
 Sat May  6 12:03:53 2006
@@ -30,10 +30,8 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sdo.SDOTypeVisitor;
 import org.apache.tuscany.sdo.helper.XSDHelperImpl;
 import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.apache.tuscany.sdo.util.SDOUtil;
 import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModelFactory;
@@ -49,7 +47,6 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
-import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.ExtendedMetaData;
 
 import commonj.sdo.helper.XSDHelper;

Modified: 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/Account.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/Account.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/Account.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/Account.java
 Sat May  6 12:03:53 2006
@@ -1,3 +1,19 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate;
 
 import java.math.BigDecimal;

Modified: 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/Customer.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/Customer.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/Customer.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/Customer.java
 Sat May  6 12:03:53 2006
@@ -1,3 +1,19 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate;
 
 public class Customer {

Modified: 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
 Sat May  6 12:03:53 2006
@@ -1,3 +1,19 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate;
 
 public class CustomerValue {

Modified: 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
 Sat May  6 12:03:53 2006
@@ -1,9 +1,21 @@
-package org.apache.tuscany.tools.java2wsdl.generate;
-
 /**
- * 
- * @author jjojo
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+package org.apache.tuscany.tools.java2wsdl.generate;
+
 public class CustomerWithAccount {
 
        private Customer customer = new Customer();

Modified: 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WsdlTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WsdlTestCase.java?rev=400351&r1=400350&r2=400351&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WsdlTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/tools/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WsdlTestCase.java
 Sat May  6 12:03:53 2006
@@ -1,13 +1,25 @@
+/**
+ *
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as 
applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package org.apache.tuscany.tools.java2wsdl.generate;
 
-import java.io.File;
-
 import junit.framework.TestCase;
 
 /**
  * A JUnit test case to test the Tuscany Java 2 WSDL Generation
- * 
- * @author jjojo
  */
 public class TuscanyJava2WsdlTestCase extends TestCase {
 


Reply via email to