cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r492984 [1/2] - in /incubator/cxf/trunk: rt/core/ rt/core/src/test/java/org/apache/cxf/attachment/ rt/core/src/test/java/org/apache/cxf/wsdl11/ rt/core/src/test/resources/org/apache/cxf/wsdl11/ tools2/ tools2/common/src/main/java/org/apache...
Date Fri, 05 Jan 2007 11:20:08 GMT
Author: mmao
Date: Fri Jan  5 03:20:06 2007
New Revision: 492984

URL: http://svn.apache.org/viewvc?view=rev&rev=492984
Log:
* Refactoring annotation processing
  Introduce the JavaAnnotatable interface 
* Clean up the pom
  Remove useless dependencies
* Resolve the dependency conflicts due to tools2 depends on tools2-common 
  Duplicate the wsdl resource into rt/core,
  Duplicate the wsdl resource into tools2/frontend/jaxws 
* Remove the jaxws binding from the java code model, since it's not part of the code model.

Added:
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl   (with props)
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl   (with props)
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl   (with props)
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl   (with props)
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl   (with props)
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl   (with props)
    incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaAnnotatable.java   (with props)
    incubator/cxf/trunk/tools2/validator/
      - copied from r492465, incubator/cxf/trunk/tools/validator/
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/SoapBindingAnnotator.java   (with props)
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebResultAnnotator.java   (with props)
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WrapperAnnotator.java   (with props)
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/hello_world_xml_bare.wsdl   (with props)
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/jms_test.wsdl   (with props)
Modified:
    incubator/cxf/trunk/rt/core/pom.xml
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
    incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/Annotator.java
    incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java
    incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
    incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaModel.java
    incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java
    incubator/cxf/trunk/tools2/pom.xml
    incubator/cxf/trunk/tools2/validator/pom.xml
    incubator/cxf/trunk/tools2/wsdlto/core/pom.xml
    incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/pom.xml
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/pom.xml
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/BindingAnnotator.java
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotator.java
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-plugin.xml
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
    incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
    incubator/cxf/trunk/tools2/wsdlto/test/pom.xml

Modified: incubator/cxf/trunk/rt/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/pom.xml?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/rt/core/pom.xml (original)
+++ incubator/cxf/trunk/rt/core/pom.xml Fri Jan  5 03:20:06 2007
@@ -43,11 +43,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-testutils</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.ws.commons</groupId>
             <artifactId>XmlSchema</artifactId>
         </dependency> 

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java Fri Jan  5 03:20:06 2007
@@ -69,7 +69,6 @@
         assertTrue(ct.indexOf("multipart/related;") == 0);
         assertTrue(ct.indexOf("start=\"<root.message@cxf.apache.org>\"") > -1);
         assertTrue(ct.indexOf("start-info=\"application/soap+xml; charset=UTF-8\"") > -1);
-        System.out.println(ct);
         out.write("<soap:Body/>".getBytes());
         
         serializer.writeAttachments();

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java Fri Jan  5 03:20:06 2007
@@ -56,7 +56,7 @@
     }
     
     public void testBuildImportedWSDL() throws Exception {
-        String wsdlUrl = getClass().getResource("/wsdl/hello_world_services.wsdl").toString();
+        String wsdlUrl = getClass().getResource("hello_world_services.wsdl").toString();
         
         WSDLDefinitionBuilder builder = new WSDLDefinitionBuilder();
         Definition def = builder.build(wsdlUrl);

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java Fri Jan  5 03:20:06 2007
@@ -36,7 +36,7 @@
 
     public void testBuildSimpleWSDL() throws Exception {
         String qname = "http://apache.org/hello_world_soap_http";
-        String wsdlUrl = getClass().getResource("/wsdl/hello_world.wsdl").toString();
+        String wsdlUrl = getClass().getResource("hello_world.wsdl").toString();
         
         WSDLManagerImpl builder = new WSDLManagerImpl();
         Definition def = builder.getDefinition(wsdlUrl);
@@ -44,19 +44,19 @@
         
         Map services = def.getServices();
         assertNotNull(services);
-        assertEquals(7, services.size());
+        assertEquals(1, services.size());
         Service service = (Service)services.get(new QName(qname, "SOAPService"));
         assertNotNull(service);
         
         Map ports = service.getPorts();
         assertNotNull(ports);
-        assertEquals(2, ports.size());
+        assertEquals(1, ports.size());
         Port port = service.getPort("SoapPort");
         assertNotNull(port);
     }
     
     public void testBuildImportedWSDL() throws Exception {
-        String wsdlUrl = getClass().getResource("/wsdl/hello_world_services.wsdl").toString();
+        String wsdlUrl = getClass().getResource("hello_world_services.wsdl").toString();
         
         WSDLManagerImpl builder = new WSDLManagerImpl();
         Definition def = builder.getDefinition(wsdlUrl);

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java Fri Jan  5 03:20:06 2007
@@ -430,7 +430,7 @@
     
     public void testParameterOrder() throws Exception {
         String ns = "http://apache.org/hello_world_xml_http/bare";
-        setUpWSDL("/wsdl/hello_world_xml_bare.wsdl", 0);
+        setUpWSDL("hello_world_xml_bare.wsdl", 0);
         
         OperationInfo operation = serviceInfo.getInterface().getOperation(new QName(ns, 
                                                                                     "testTriPart"));
@@ -468,7 +468,7 @@
     }
     
     public void testParameterOrder2() throws Exception {
-        setUpWSDL("/wsdl/bug161/header2.wsdl", 0);
+        setUpWSDL("header2.wsdl", 0);
         String ns = "http://apache.org/header2";
         OperationInfo operation = serviceInfo.getInterface().getOperation(new QName(ns, "headerMethod"));
         assertNotNull(operation);

Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl?view=auto&rev=492984
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl Fri Jan  5 03:20:06 2007
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you 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.
+-->
+
+<definitions name="header2" targetNamespace="http://apache.org/header2" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:tns="http://apache.org/header2" 
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <types>
+        <schema targetNamespace="http://apache.org/header2" 
+            xmlns="http://www.w3.org/2001/XMLSchema" 
+            xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+            <complexType name="HeaderData">
+                <sequence>
+                    <element maxOccurs="1" minOccurs="1" name="count" type="int"/>
+                </sequence>
+            </complexType>
+            <element name="HeaderInfo" type="tns:HeaderData"/>
+
+            <element name="Header">
+               <complexType>
+                    <sequence>
+                        <element name="requestType" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="HeaderResponse">
+               <complexType>
+                    <sequence>
+                        <element name="responseType" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </types>
+
+    <message name="headerRequest">
+        <part element="tns:HeaderInfo" name="header_info"/>
+        <part element="tns:Header" name="the_request"/>
+    </message>
+    <message name="headerResponse">
+        <part element="tns:HeaderInfo" name="header_info"/>
+        <part element="tns:HeaderResponse" name="the_response"/>
+    </message>
+
+    <portType name="header2Test">
+        <operation name="headerMethod">
+            <input message="tns:headerRequest" name="headerRequest"/>
+            <output message="tns:headerResponse" name="headerResponse"/>
+        </operation>
+    </portType>
+
+    <binding name="header2Binding" type="tns:header2Test">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="headerMethod">
+            <soap:operation soapAction="" style="document"/>
+            <input name="headerRequest">
+                <soap:header message="tns:headerRequest" part="header_info" 
+                    use="literal"/>
+                <soap:body parts="the_request" use="literal"/>
+            </input>
+            <output name="headerResponse">
+                <soap:header message="tns:headerResponse" part="header_info" 
+                    use="literal"/>
+                <soap:body parts="the_response" use="literal"/>
+            </output>
+        </operation>
+    </binding>
+
+    <service name="Header2Service">
+        <port binding="tns:header2Binding" name="SoapPort">
+            <soap:address location="http://localhost:9000/header2"/>
+        </port>
+    </service>
+</definitions>

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/header2.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl?view=auto&rev=492984
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl Fri Jan  5 03:20:06 2007
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<wsdl:definitions name="HelloWorld"
+		  xmlns="http://schemas.xmlsoap.org/wsdl/"
+		  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+		  xmlns:x2="http://apache.org/hello_world"
+		  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+		  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		  targetNamespace="http://apache.org/hello_world/bindings">
+
+
+    <wsdl:import
+	namespace="http://apache.org/hello_world"
+	location="hello_world_wsdl_import.wsdl"/>
+
+    <wsdl:binding name="SOAPBinding" type="x2:Greeter">
+	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+	<wsdl:operation name="sayHi">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	</wsdl:operation>
+	<wsdl:operation name="greetMe">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	</wsdl:operation>
+	<wsdl:operation name="pingMe">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	    <wsdl:fault name="pingMeFault">
+		<soap:fault name="pingMeFault" use="literal"/>
+	    </wsdl:fault>
+	</wsdl:operation>
+    </wsdl:binding>
+
+</wsdl:definitions>

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_bindings.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl?view=auto&rev=492984
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl Fri Jan  5 03:20:06 2007
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you 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.
+-->
+<wsdl:definitions name="HelloWorld"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:tns="http://apache.org/hello_world/messages"
+    xmlns:x1="http://apache.org/hello_world/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://apache.org/hello_world/messages">
+    <wsdl:types>
+        <schema
+            xmlns="http://www.w3.org/2001/XMLSchema"
+            xmlns:x1="http://apache.org/hello_world/types"
+            targetNamespace="http://apache.org/hello_world/types"
+            elementFormDefault="qualified">
+            <element name="sayHi">
+                <complexType/>
+            </element>
+            <element name="sayHiResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMe">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="pingMe">
+                <complexType/>
+            </element>
+            <element name="pingMeResponse">
+                <complexType/>
+            </element>
+            <element name="faultDetail">
+                <complexType>
+                    <sequence>
+                        <element name="minor" type="short" form="qualified" minOccurs="0"/>
+                        <element name="major" type="short" form="qualified" minOccurs="0"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+    <wsdl:message name="sayHiRequest">
+        <wsdl:part name="in" element="x1:sayHi"/>
+    </wsdl:message>
+    <wsdl:message name="sayHiResponse">
+        <wsdl:part name="out" element="x1:sayHiResponse"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeRequest">
+        <wsdl:part name="in" element="x1:greetMe"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeResponse">
+        <wsdl:part name="out" element="x1:greetMeResponse"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeRequest">
+        <wsdl:part name="in" element="x1:pingMe"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeResponse">
+        <wsdl:part name="out" element="x1:pingMeResponse"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeFault">
+        <wsdl:part name="faultDetail" element="x1:faultDetail"/>
+    </wsdl:message>
+</wsdl:definitions>

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_messages.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl?view=auto&rev=492984
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl Fri Jan  5 03:20:06 2007
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<wsdl:definitions name="HelloWorld"
+		  xmlns="http://schemas.xmlsoap.org/wsdl/"
+		  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"		 
+		  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+		  xmlns:tns="http://apache.org/hello_world/services"
+		  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		  xmlns:x1="http://apache.org/hello_world/bindings"
+		  xmlns:x2="http://apache.org/hello_world"
+		  targetNamespace="http://apache.org/hello_world/services">
+
+    <wsdl:import
+        namespace="http://apache.org/hello_world/bindings"
+        location="hello_world_bindings.wsdl"/>
+
+    <wsdl:service name="SOAPService">
+	<wsdl:port name="SoapPort" binding="x1:SOAPBinding">
+	    <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
+	</wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
+

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_services.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl?view=auto&rev=492984
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl Fri Jan  5 03:20:06 2007
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you 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.
+-->
+<wsdl:definitions name="HelloWorldImport"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:tns="http://apache.org/hello_world"
+    xmlns:x1="http://apache.org/hello_world/messages"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://apache.org/hello_world">
+
+    <wsdl:import
+        namespace="http://apache.org/hello_world/messages"
+        location="hello_world_messages.wsdl"/>
+
+    <wsdl:portType name="Greeter">
+        <wsdl:operation name="sayHi">
+            <wsdl:input message="x1:sayHiRequest" name="sayHiRequest"/>
+            <wsdl:output message="x1:sayHiResponse" name="sayHiResponse"/>
+        </wsdl:operation>
+
+        <wsdl:operation name="greetMe">
+            <wsdl:input message="x1:greetMeRequest" name="greetMeRequest"/>
+            <wsdl:output message="x1:greetMeResponse" name="greetMeResponse"/>
+        </wsdl:operation>
+
+        <wsdl:operation name="pingMe">
+            <wsdl:input name="pingMeRequest" message="x1:pingMeRequest"/>
+            <wsdl:output name="pingMeResponse" message="x1:pingMeResponse"/>
+            <wsdl:fault name="pingMeFault" message="x1:pingMeFault"/>
+        </wsdl:operation>
+    </wsdl:portType>
+</wsdl:definitions>

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_wsdl_import.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl?view=auto&rev=492984
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl Fri Jan  5 03:20:06 2007
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_xml_http/bare" 
+		  xmlns="http://schemas.xmlsoap.org/wsdl/"
+		  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+		  xmlns:xformat="http://cxf.apache.org/bindings/xformat" 
+		  xmlns:tns="http://apache.org/hello_world_xml_http/bare"
+		  xmlns:x1="http://apache.org/hello_world_xml_http/bare/types"
+		  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+		  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    
+    <wsdl:types>
+	<schema targetNamespace="http://apache.org/hello_world_xml_http/bare/types" 
+		xmlns="http://www.w3.org/2001/XMLSchema" 
+		elementFormDefault="qualified">
+
+	    <element name="responseType" type="xsd:string"/>
+	    <element name="requestType" type="xsd:string"/>      
+	    <element name="myComplexStruct" type="x1:myComplexStructType"/>     
+	    
+	    <complexType name="myComplexStructType">
+		<sequence>
+		    <element name="elem1" type="xsd:string"/>
+		    <element name="elem2" type="xsd:string"/>
+		    <element name="elem3" type="xsd:int"/>
+		</sequence>
+	    </complexType>
+	</schema>
+    </wsdl:types>
+    
+    <wsdl:message name="sayHiRequest"/>
+    
+    <wsdl:message name="sayHiResponse">
+	<wsdl:part type="xsd:string" name="out"/>
+    </wsdl:message>
+    
+    <wsdl:message name="greetMeRequest">
+	<wsdl:part element="x1:requestType" name="me"/>
+    </wsdl:message>
+    
+    <wsdl:message name="greetMeResponse">
+	<wsdl:part element="x1:responseType" name="theResponse"/>
+    </wsdl:message>
+    
+    <wsdl:message name="sendReceiveDataRequest">
+	<wsdl:part type="x1:myComplexStructType" name="in"/>
+    </wsdl:message>
+    
+    <wsdl:message name="sendReceiveDataResponse">
+	<wsdl:part type="x1:myComplexStructType" name="out"/>
+    </wsdl:message>
+
+    <wsdl:message name="multiParamPartRequest">
+	<wsdl:part element="x1:requestType" name="in1"/>
+	<wsdl:part element="x1:myComplexStruct" name="in2"/>
+    </wsdl:message>
+    
+    <wsdl:message name="multiParamPartResponse">
+	<wsdl:part element="x1:responseType" name="out1"/>
+    </wsdl:message>
+    
+    <wsdl:message name="triPartRequest">
+	<wsdl:part element="x1:requestType" name="in3"/>
+	<wsdl:part element="x1:myComplexStruct" name="in1"/>
+	<wsdl:part element="x1:requestType" name="in2"/>
+    </wsdl:message>
+    
+    <wsdl:portType name="Greeter">
+	<wsdl:operation name="sayHi">
+	    <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
+	    <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+	</wsdl:operation>
+	<wsdl:operation name="greetMe">
+	    <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+	    <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+	</wsdl:operation>
+	<wsdl:operation name="sendReceiveData">
+	    <wsdl:input message="tns:sendReceiveDataRequest" name="SendReceiveDataRequest"/>
+	    <wsdl:output message="tns:sendReceiveDataResponse" name="SendReceiveDataResponse"/>
+	</wsdl:operation>
+	<wsdl:operation name="testMultiParamPart" parameterOrder="in2 in1">
+	    <wsdl:input message="tns:multiParamPartRequest" name="multiParamPartRequest"/>
+	    <wsdl:output message="tns:multiParamPartResponse" name="multiParamPartResponse"/>
+	</wsdl:operation>
+	<wsdl:operation name="testTriPart" parameterOrder="in1 in3 in2">
+	    <wsdl:input message="tns:triPartRequest" name="triPartRequest"/>
+	    <wsdl:output message="tns:multiParamPartResponse" name="multiParamPartResponse"/>
+	</wsdl:operation>
+	<wsdl:operation name="testTriPartNoOrder">
+	    <wsdl:input message="tns:triPartRequest" name="triPartRequest"/>
+	    <wsdl:output message="tns:multiParamPartResponse" name="multiParamPartResponse"/>
+	</wsdl:operation>
+    </wsdl:portType>
+    
+    <wsdl:binding name="Greeter_XMLBinding" type="tns:Greeter">
+
+	<xformat:binding/>
+
+	<wsdl:operation name="sayHi">
+	    <wsdl:input>
+		<xformat:body rootNode="tns:sayHi"/>
+	    </wsdl:input>
+	    <wsdl:output/>
+	</wsdl:operation>
+	
+	<wsdl:operation name="greetMe">
+	    <wsdl:input/>
+	    <wsdl:output/>
+	</wsdl:operation>
+	
+	<wsdl:operation name="sendReceiveData">
+	    <wsdl:input/>
+	    <wsdl:output/>
+	</wsdl:operation>
+
+	<wsdl:operation name="testMultiParamPart">
+	    <wsdl:input>
+		<xformat:body rootNode="tns:multiParamRootReq"/>
+	    </wsdl:input>
+	    <wsdl:output/>
+	</wsdl:operation>
+
+    </wsdl:binding>
+    
+    <wsdl:service name="XMLService">
+	<wsdl:port binding="tns:Greeter_XMLBinding" name="XMLPort">
+	    <http:address location="http://localhost:9031/XMLService/XMLPort"/>
+	</wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_xml_bare.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/Annotator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/Annotator.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/Annotator.java (original)
+++ incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/Annotator.java Fri Jan  5 03:20:06 2007
@@ -20,5 +20,5 @@
 package org.apache.cxf.tools.common.model;
 
 public interface Annotator {
-    // To indicator it is a annotation processor
+    void annotate(JavaAnnotatable annotatable);
 }

Added: incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaAnnotatable.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaAnnotatable.java?view=auto&rev=492984
==============================================================================
--- incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaAnnotatable.java (added)
+++ incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaAnnotatable.java Fri Jan  5 03:20:06 2007
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.cxf.tools.common.model;
+
+public interface JavaAnnotatable {
+    void annotate(Annotator annotator);
+}

Propchange: incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaAnnotatable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaAnnotatable.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java (original)
+++ incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaInterface.java Fri Jan  5 03:20:06 2007
@@ -21,11 +21,9 @@
 
 import java.util.*;
 import javax.jws.soap.SOAPBinding;
-import org.w3c.dom.Element;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.extensions.jaxws.JAXWSBinding;
 
-public class JavaInterface {
+public class JavaInterface implements JavaAnnotatable {
 
     private String name;
     private String packageName;
@@ -40,11 +38,7 @@
     private final List<String> annotations = new ArrayList<String>();
     private final Set<String> imports = new TreeSet<String>();
 
-    private JAXWSBinding jaxwsBinding = new JAXWSBinding();
-    private JAXWSBinding bindingExt = new JAXWSBinding();
-    
     private String webserviceName;
-    private Element handlerChains;
       
     public JavaInterface() {
     }
@@ -178,16 +172,6 @@
         return this.annotations;
     }
 
-    public JAXWSBinding getJAXWSBinding() {
-        return this.jaxwsBinding;
-    }
-    
-    public void setJAXWSBinding(JAXWSBinding binding) {
-        if (binding != null) {
-            this.jaxwsBinding = binding;
-        }
-    }
-
     public void addImport(String i) {
         imports.add(i);
     }
@@ -196,24 +180,12 @@
         return imports.iterator();
     }
 
-    public Element getHandlerChains() {
-        return this.handlerChains;
-    }
-
-    public void setHandlerChains(Element elem) {
-        this.handlerChains = elem;
-    }
-
-    public JAXWSBinding getBindingExt() {
-        return bindingExt;
-    }
-
-    public void setBindingExt(JAXWSBinding pBindingExt) {
-        this.bindingExt = pBindingExt;
-    }
-    
     public void setJavaModel(JavaModel jm) {
         this.model = jm;
+    }
+
+    public void annotate(Annotator annotator) {
+        annotator.annotate(this);
     }
     
 }

Modified: incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java (original)
+++ incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java Fri Jan  5 03:20:06 2007
@@ -32,9 +32,8 @@
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.extensions.jaxws.JAXWSBinding;
 
-public class JavaMethod {
+public class JavaMethod implements JavaAnnotatable {
     private static final Logger LOG = LogUtils.getL7dLogger(JavaMethod .class);
     private String name;
     private String operationName;
@@ -51,8 +50,6 @@
     private final List<JavaException> exceptions = new ArrayList<JavaException>();
     private final Map<String, JavaAnnotation> annotations = new HashMap<String, JavaAnnotation>();
     private final List<WSDLException> wsdlExceptions = new ArrayList<WSDLException>();
-    private JAXWSBinding jaxwsBinding = new JAXWSBinding();
-    private JAXWSBinding bindingExt = new JAXWSBinding();
 
     public JavaMethod() {
         this.javaInterface = new JavaInterface();
@@ -301,16 +298,6 @@
         return list;
     }
 
-    public JAXWSBinding getJAXWSBinding() {
-        return this.jaxwsBinding;
-    }
-
-    public void setJAXWSBinding(JAXWSBinding binding) {
-        if (binding != null) {
-            this.jaxwsBinding = binding;
-        }
-    }
-
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append("\n========================\n");
@@ -329,15 +316,11 @@
         return sb.toString();
     }
 
-    public JAXWSBinding getBindingExt() {
-        return bindingExt;
-    }
-
-    public void setBindingExt(JAXWSBinding pBindingExt) {
-        this.bindingExt = pBindingExt;
-    }
-    
     public void setInterface(JavaInterface intf) {
         this.javaInterface = intf;
+    }
+
+    public void annotate(Annotator annotator) {
+        annotator.annotate(this);
     }
 }

Modified: incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaModel.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaModel.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaModel.java (original)
+++ incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaModel.java Fri Jan  5 03:20:06 2007
@@ -21,8 +21,6 @@
 
 import java.util.*;
 
-import org.apache.cxf.tools.common.extensions.jaxws.JAXWSBinding;
-
 public class JavaModel {
 
     private final Map<String, JavaInterface> interfaces;
@@ -30,13 +28,11 @@
     private final Map<String, JavaServiceClass> serviceClasses;
     
     private String location;
-    private JAXWSBinding jaxwsBinding;
-    
+
     public JavaModel() {
         interfaces = new HashMap<String, JavaInterface>();
         exceptionClasses = new HashMap<String, JavaExceptionClass>();
         serviceClasses = new HashMap<String, JavaServiceClass>();
-        jaxwsBinding = new JAXWSBinding();
     }
 
     public void addInterface(String name, JavaInterface i) {
@@ -70,15 +66,5 @@
 
     public String getLocation() {
         return this.location;
-    }
-
-    public JAXWSBinding getJAXWSBinding() {
-        return this.jaxwsBinding;
-    }
-    
-    public void setJAXWSBinding(JAXWSBinding binding) {
-        if (binding != null) {
-            this.jaxwsBinding = binding;
-        }
     }
 }

Modified: incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java (original)
+++ incubator/cxf/trunk/tools2/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java Fri Jan  5 03:20:06 2007
@@ -21,7 +21,7 @@
 
 import com.sun.xml.bind.api.TypeReference;
 
-public class JavaParameter extends JavaType {
+public class JavaParameter extends JavaType implements JavaAnnotatable {
 
     private boolean holder;
     private String holderName;
@@ -29,6 +29,8 @@
     private JavaAnnotation annotation;
     private String partName;
 
+    private JavaMethod javaMethod;
+    
     public JavaParameter() {
     }
     public JavaParameter(String pname, TypeReference pref , JavaType.Style pstyle) {
@@ -109,5 +111,17 @@
             return sb.toString(); 
         }
         return super.getDefaultTypeValue();
+    }
+
+    public void setMethod(JavaMethod jm) {
+        this.javaMethod = jm;
+    }
+
+    public JavaMethod getMethod() {
+        return this.javaMethod;
+    }
+
+    public void annotate(Annotator annotator) {
+        annotator.annotate(this);
     }
 }

Modified: incubator/cxf/trunk/tools2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/pom.xml?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/pom.xml (original)
+++ incubator/cxf/trunk/tools2/pom.xml Fri Jan  5 03:20:06 2007
@@ -36,6 +36,8 @@
     </properties>
     
     <modules>
+	<module>common</module>
+	<module>validator</module>
 	<module>wsdlto</module>
     </modules>
 </project>

Modified: incubator/cxf/trunk/tools2/validator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/validator/pom.xml?view=diff&rev=492984&r1=492465&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/validator/pom.xml (original)
+++ incubator/cxf/trunk/tools2/validator/pom.xml Fri Jan  5 03:20:06 2007
@@ -19,15 +19,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf</groupId>
-    <artifactId>cxf-tools-validator</artifactId>
+    <artifactId>cxf-tools2-validator</artifactId>
     <packaging>jar</packaging>
     <version>2.0-incubator-RC-SNAPSHOT</version>
-    <name>Apache CXF Command Line Tools Validator</name>
+    <name>Apache CXF Command Line Tools2 Validator</name>
     <url>http://cwiki.apache.org/confluence/display/CXF/Index</url>
 
     <parent>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools</artifactId>
+        <artifactId>cxf-tools2</artifactId>
         <version>2.0-incubator-RC-SNAPSHOT</version>
     </parent>
 
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-tools-common</artifactId>
+            <artifactId>cxf-tools2-common</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -94,9 +94,9 @@
         </dependency>
         
         <dependency>
-		     <groupId>org.apache.cxf</groupId>
-		     <artifactId>cxf-common-schemas</artifactId>
-		     <version>${project.version}</version>
+	    <groupId>org.apache.cxf</groupId>
+	    <artifactId>cxf-common-schemas</artifactId>
+	    <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: incubator/cxf/trunk/tools2/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/core/pom.xml?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/core/pom.xml (original)
+++ incubator/cxf/trunk/tools2/wsdlto/core/pom.xml Fri Jan  5 03:20:06 2007
@@ -49,7 +49,7 @@
 	</dependency>
 	<dependency>
 	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-tools-validator</artifactId>
+	    <artifactId>cxf-tools2-validator</artifactId>
 	    <version>${project.version}</version>
 	</dependency>
 	<dependency>
@@ -145,11 +145,6 @@
 			    <xsdOptions>
 				<xsdOption>
 				    <xsd>${basedir}/src/main/resources/schemas/plugin.xsd</xsd>
-				</xsdOption>
-
-				<xsdOption>
-				    <xsd>${basedir}/src/main/resources/schemas/wsdl11/xml-binding.xsd</xsd>
-				    <bindingFile>${basedir}/src/main/resources/schemas/wsdl11/xml-binding.xjb</bindingFile>
 				</xsdOption>
 			    </xsdOptions>
 			</configuration>

Modified: incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/pom.xml?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/pom.xml (original)
+++ incubator/cxf/trunk/tools2/wsdlto/databinding/jaxb/pom.xml Fri Jan  5 03:20:06 2007
@@ -50,42 +50,7 @@
 	    <artifactId>junit</artifactId>
 	    <scope>test</scope>
 	</dependency>
-	<dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-tools2-common</artifactId>
-	    <version>${project.version}</version>
-	</dependency>
-	
-	<dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-tools-wsdl2java</artifactId>
-	    <version>${project.version}</version>
-	</dependency>
-	
-	<dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-tools-validator</artifactId>
-	    <version>${project.version}</version>
-	</dependency>
-	
-	<dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-rt-core</artifactId>
-	    <version>${project.version}</version>
-	</dependency>
-	
-	<dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-rt-bindings-xml</artifactId>
-	    <version>${project.version}</version>
-	</dependency>
-	
-	<dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-rt-transports-jms</artifactId>
-	    <version>${project.version}</version>
-	</dependency>
-	
+
 	<dependency>
 	    <groupId>org.apache.cxf</groupId>
 	    <artifactId>cxf-tools2-wsdlto-core</artifactId>

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/pom.xml?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/pom.xml Fri Jan  5 03:20:06 2007
@@ -49,47 +49,27 @@
 
 	<dependency>
 	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-tools-wsdl2java</artifactId>
+	    <artifactId>cxf-rt-core</artifactId>
 	    <version>${project.version}</version>
 	</dependency>
 
 	<dependency>
 	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-tools-validator</artifactId>
+	    <artifactId>cxf-rt-bindings-xml</artifactId>
 	    <version>${project.version}</version>
 	</dependency>
 
 	<dependency>
 	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-rt-core</artifactId>
+	    <artifactId>cxf-rt-transports-jms</artifactId>
 	    <version>${project.version}</version>
 	</dependency>
 
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-bindings-xml</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-	<dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-rt-transports-jms</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
 	<dependency>
 	    <groupId>org.apache.cxf</groupId>
 	    <artifactId>cxf-tools2-wsdlto-core</artifactId>
 	    <version>${project.version}</version>
 	</dependency>
-	
 	 
-	 <dependency>
-	 	    <groupId>org.apache.cxf</groupId>
-	 	    <artifactId>cxf-tools2-wsdlto-databinding-jaxb</artifactId>
-	 	    <version>${project.version}</version>
-	</dependency>
-	 
-
     </dependencies>
 </project>

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java Fri Jan  5 03:20:06 2007
@@ -61,9 +61,11 @@
         //         seiAnnotationProcessor.process(serviceInfo);
 
         JavaInterface intf = javaModel.getInterfaces().values().iterator().next();
-        new WebServiceAnnotator().annotate(intf);
+        intf.annotate(new WebServiceAnnotator());
+        //new WebServiceAnnotator().annotate(intf);
         if (serviceInfo.getBindings().size() > 0) {
-            new BindingAnnotator().annotate(intf);
+            intf.annotate(new BindingAnnotator());
+            //new BindingAnnotator().annotate(intf);
         }
 
 

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java Fri Jan  5 03:20:06 2007
@@ -36,18 +36,19 @@
 import org.apache.cxf.tools.common.model.JavaParameter;
 import org.apache.cxf.tools.common.model.JavaReturn;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator.SoapBindingAnnotator;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator.WebMethodAnnotator;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator.WebResultAnnotator;
+import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator.WrapperAnnotator;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.mapper.MethodMapper;
 
 public class OperationProcessor  extends AbstractProcessor {
    
     private JavaParameter wrapperRequest;
     private JavaParameter wrapperResponse;
-    private WebMethodAnnotator annotator;
         
     public OperationProcessor(ToolContext c) {
         super(c);
-        annotator = new WebMethodAnnotator();
     }
 
     @SuppressWarnings("unchecked")
@@ -88,15 +89,15 @@
                                outputMessage,
                                operation.getParameterOrdering());
 
-        annotator.addWebMethodAnnotation(method);
+        method.annotate(new WebMethodAnnotator());
         
-        if (!method.isWrapperStyle()) {
+        if (method.isWrapperStyle()) {
             setWrapper(operation);
-            annotator.addWrapperAnnotation(method, wrapperRequest, wrapperResponse);
+            method.annotate(new WrapperAnnotator(wrapperRequest, wrapperResponse));
         }
-        
-        annotator.addWebResultAnnotation(method);
-        annotator.addSOAPBindingAnnotation(method);
+
+        method.annotate(new WebResultAnnotator());
+        method.annotate(new SoapBindingAnnotator());
         
         JAXWSBinding opBinding = (JAXWSBinding)operation.getExtensor(JAXWSBinding.class);
         
@@ -151,12 +152,14 @@
         pollingMethod.setStyle(method.getStyle());
         pollingMethod.setWrapperStyle(method.isWrapperStyle());
         pollingMethod.setSoapAction(method.getSoapAction());
+        pollingMethod.setOperationName(method.getOperationName());
 
         JavaReturn future = new JavaReturn();
         future.setClassName("Future<?>");
         pollingMethod.setReturn(future);
 
-        annotator.addWebMethodAnnotation(pollingMethod, method.getOperationName());
+        // REVISIT: test the operation name in the annotation
+        pollingMethod.annotate(new WebMethodAnnotator());
         pollingMethod.addAnnotation("ResponseWrapper", method.getAnnotationMap().get("ResponseWrapper"));
         pollingMethod.addAnnotation("RequestWrapper", method.getAnnotationMap().get("RequestWrapper"));
         pollingMethod.addAnnotation("SOAPBinding", method.getAnnotationMap().get("SOAPBinding"));
@@ -184,12 +187,14 @@
         callbackMethod.setStyle(method.getStyle());
         callbackMethod.setWrapperStyle(method.isWrapperStyle());
         callbackMethod.setSoapAction(method.getSoapAction());
-
+        callbackMethod.setOperationName(method.getOperationName());
+        
         JavaReturn response = new JavaReturn();
         response.setClassName(getAsyncClassName(method, "Response"));
         callbackMethod.setReturn(response);
 
-        annotator.addWebMethodAnnotation(callbackMethod, method.getOperationName());
+        // REVISIT: test the operation name in the annotation
+        callbackMethod.annotate(new WebMethodAnnotator());
         callbackMethod.addAnnotation("RequestWrapper", method.getAnnotationMap().get("RequestWrapper"));
         callbackMethod.addAnnotation("ResponseWrapper", method.getAnnotationMap().get("ResponseWrapper"));
         callbackMethod.addAnnotation("SOAPBinding", method.getAnnotationMap().get("SOAPBinding"));

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java Fri Jan  5 03:20:06 2007
@@ -97,7 +97,9 @@
     }
 
     private JavaParameter addParameter(JavaMethod method, JavaParameter parameter) throws ToolException {
-        new WebParamAnnotator().annotate(method, parameter);
+        parameter.setMethod(method);
+        parameter.annotate(new WebParamAnnotator());
+        //new WebParamAnnotator().annotate(method, parameter);
         method.addParameter(parameter);
         return parameter;
     }

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java Fri Jan  5 03:20:06 2007
@@ -26,7 +26,6 @@
 
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.http.HTTPBinding;
-import javax.wsdl.extensions.mime.MIMEMultipartRelated;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.service.model.BindingInfo;
@@ -362,14 +361,6 @@
                     setParameterAsHeader(jp);
                 }
             }
-            if (ext instanceof MIMEMultipartRelated && jm.getBindingExt().isEnableMime()) {
-                // Commented for future use
-                LOG.warning("The MIME content in wsdl file will be ignored, "
-                            + "current version does not support MIME content");
-                // MIMEProcessor mimeProcessor = new MIMEProcessor(context);
-                // mimeProcessor.process(jm, (MIMEMultipartRelated)obj,
-                // JavaType.Style.IN);
-            }
         }
 
         // process output
@@ -402,16 +393,6 @@
                         setParameterAsHeader(jp);
                     }
                 }
-                if (ext instanceof MIMEMultipartRelated && jm.getBindingExt().isEnableMime()) {
-                    // Commented for future use
-                    LOG.warning("The MIME content in wsdl file will be ignored, "
-                                + "current version does not support MIME content");
-                    // MIMEProcessor mimeProcessor = new
-                    // MIMEProcessor(context);
-                    // mimeProcessor.process(jm, (MIMEMultipartRelated)obj,
-                    // JavaType.Style.OUT);
-
-                }
             }
         }
 
@@ -547,82 +528,6 @@
         return null;
     }
     
-    //private void cutomizing(JavaModel jmodel,  ji)
-
-    // TODO: enable customize
- /*    private void doCustomizeBinding(JavaModel jmodel, JavaInterface ji, Binding binding) {
-         JAXWSBinding bindingExt = null;
-         List extElements = binding.getExtensibilityElements();
-         if (extElements.size() > 0) {
-             Iterator iterator = extElements.iterator();
-             while (iterator.hasNext()) {
-                 Object obj = iterator.next();
-                 if (obj instanceof JAXWSBinding) {
-                     bindingExt = (JAXWSBinding)obj;
-                     ji.setBindingExt(bindingExt);
-                     return;
-                 }
-             }
-         }
-         String portTypeName = binding.getPortType().getQName().getLocalPart();
-         bindingExt = CustomizationParser.getInstance().getPortTypeExtension(portTypeName);
-         if (bindingExt != null) {
-             if (!bindingExt.isSetMimeEnable() && jmodel.getJAXWSBinding().isSetMimeEnable()
-                 && jmodel.getJAXWSBinding().isEnableMime()) {
-                 bindingExt.setSetMimeEnable(true);
-                 bindingExt.setEnableMime(true);
-             }
-         } else if (jmodel.getJAXWSBinding() != null) {
-             bindingExt = new JAXWSBinding();
-             if (jmodel.getJAXWSBinding().isSetMimeEnable() && jmodel.getJAXWSBinding().isEnableMime()) {
-                 bindingExt.setSetMimeEnable(true);
-                 bindingExt.setEnableMime(true);
-             }
-         } else {
-             // TBD: There is no extensibilityelement in port type
-             bindingExt = new JAXWSBinding();
-         }
-
-         ji.setBindingExt(bindingExt);
-    }
-
-//     private void doCustomizeOperation(JavaInterface ji, JavaMethod jm, BindingOperation bo) {
-//         JAXWSBinding bindingExt = null;
-//         List extElements = bo.getExtensibilityElements();
-//         if (extElements.size() > 0) {
-//             Iterator iterator = extElements.iterator();
-//             while (iterator.hasNext()) {
-//                 Object obj = iterator.next();
-//                 if (obj instanceof JAXWSBinding) {
-//                     bindingExt = (JAXWSBinding)obj;
-//                     jm.setBindingExt(bindingExt);
-//                     return;
-//                 }
-//             }
-//         }
-//         String portTypeName = ji.getWebServiceName();
-//         String operationName = bo.getName();
-//         bindingExt = CustomizationParser.getInstance().getPortTypeOperationExtension(portTypeName,
-//                                                                                      operationName);
-//         if (bindingExt != null) {
-//             if (!bindingExt.isSetMimeEnable() && ji.getBindingExt() != null
-//                 && ji.getBindingExt().isSetMimeEnable() && ji.getBindingExt().isEnableMime()) {
-//                 bindingExt.setSetMimeEnable(true);
-//                 bindingExt.setEnableMime(true);
-//             }
-//         } else if (ji.getBindingExt() != null) {
-//             bindingExt = new JAXWSBinding();
-//             if (ji.getBindingExt().isSetMimeEnable() && ji.getBindingExt().isEnableMime()) {
-//                 bindingExt.setSetMimeEnable(true);
-//                 bindingExt.setEnableMime(true);
-//             }
-//         } else {
-//             // TBD: There is no extensibilityelement in port type
-//             bindingExt = new JAXWSBinding();
-//         }
-//         jm.setBindingExt(bindingExt);
-//     }
-*/
     public enum BindingType {
         HTTPBinding, SOAPBinding, XMLBinding
     }

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/BindingAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/BindingAnnotator.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/BindingAnnotator.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/BindingAnnotator.java Fri Jan  5 03:20:06 2007
@@ -23,6 +23,7 @@
 import javax.jws.soap.SOAPBinding;
 
 import org.apache.cxf.tools.common.model.Annotator;
+import org.apache.cxf.tools.common.model.JavaAnnotatable;
 import org.apache.cxf.tools.common.model.JavaAnnotation;
 import org.apache.cxf.tools.common.model.JavaInterface;
 import org.apache.cxf.tools.common.model.JavaMethod;
@@ -30,7 +31,14 @@
 
 public final class BindingAnnotator implements Annotator {
     
-    public void annotate(JavaInterface intf) {
+    public void annotate(JavaAnnotatable ja) {
+        JavaInterface intf;
+        if (ja instanceof JavaInterface) {
+            intf = (JavaInterface) ja;
+        } else {
+            throw new RuntimeException("BindingAnnotator can only annotate JavaInterface");
+        }
+        
         if (processBinding(intf)) {
             JavaAnnotation bindingAnnotation = new JavaAnnotation("SOAPBinding");
             String style = SOAPBindingUtil.getBindingAnnotation(intf.getSOAPStyle().toString());

Added: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/SoapBindingAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/SoapBindingAnnotator.java?view=auto&rev=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/SoapBindingAnnotator.java (added)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/SoapBindingAnnotator.java Fri Jan  5 03:20:06 2007
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator;
+
+import javax.jws.soap.SOAPBinding;
+import org.apache.cxf.tools.common.model.Annotator;
+import org.apache.cxf.tools.common.model.JavaAnnotatable;
+import org.apache.cxf.tools.common.model.JavaAnnotation;
+import org.apache.cxf.tools.common.model.JavaMethod;
+import org.apache.cxf.tools.util.SOAPBindingUtil;
+
+public class SoapBindingAnnotator implements Annotator {
+
+    public void annotate(JavaAnnotatable ja) {
+        JavaMethod method;
+        if (ja instanceof JavaMethod) {
+            method = (JavaMethod) ja;
+        } else {
+            throw new RuntimeException("SOAPBindingAnnotator can only annotate JavaMethod");
+        }
+        if (method.getSoapStyle() == SOAPBinding.Style.DOCUMENT && !method.isWrapperStyle()) {
+            JavaAnnotation bindingAnnotation = new JavaAnnotation("SOAPBinding");
+            bindingAnnotation.addArgument("parameterStyle", SOAPBindingUtil.getBindingAnnotation("BARE"), "");
+            method.addAnnotation("SOAPBinding", bindingAnnotation);
+        }
+    }
+    
+}

Propchange: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/SoapBindingAnnotator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/SoapBindingAnnotator.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotator.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotator.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotator.java Fri Jan  5 03:20:06 2007
@@ -19,30 +19,22 @@
 
 package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator;
 
-import javax.jws.soap.SOAPBinding;
-
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.tools.common.model.Annotator;
+import org.apache.cxf.tools.common.model.JavaAnnotatable;
 import org.apache.cxf.tools.common.model.JavaAnnotation;
 import org.apache.cxf.tools.common.model.JavaMethod;
-import org.apache.cxf.tools.common.model.JavaParameter;
-import org.apache.cxf.tools.util.SOAPBindingUtil;
 
 public class WebMethodAnnotator implements Annotator {
-   
-    public void addSOAPBindingAnnotation(JavaMethod method) {
-        if (method.getSoapStyle() == SOAPBinding.Style.DOCUMENT && !method.isWrapperStyle()) {
-            JavaAnnotation bindingAnnotation = new JavaAnnotation("SOAPBinding");
-            bindingAnnotation.addArgument("parameterStyle", SOAPBindingUtil.getBindingAnnotation("BARE"), "");
-            method.addAnnotation("SOAPBinding", bindingAnnotation);
-        }
-    }
-
-    public void addWebMethodAnnotation(JavaMethod method) {
-        addWebMethodAnnotation(method, method.getOperationName());
-    }
 
-    public void addWebMethodAnnotation(JavaMethod method, String operationName) {
+    public void annotate(JavaAnnotatable ja) {
+        JavaMethod method = null;
+        if (ja instanceof JavaMethod) {
+            method = (JavaMethod) ja;
+        } else {
+            throw new RuntimeException("WebMethod can only annotate JavaMethod");
+        }
+        String operationName = method.getOperationName();
         JavaAnnotation methodAnnotation = new JavaAnnotation("WebMethod");
         methodAnnotation.addArgument("operationName", operationName);
         if (!StringUtils.isEmpty(method.getSoapAction())) {
@@ -50,70 +42,5 @@
         }
         method.addAnnotation("WebMethod", methodAnnotation);
         method.getInterface().addImport("javax.jws.WebMethod");
-    }
-
-    public void addWebResultAnnotation(JavaMethod method) {
-        if (method.isOneWay()) {
-            JavaAnnotation oneWayAnnotation = new JavaAnnotation("Oneway");
-            method.addAnnotation("Oneway", oneWayAnnotation);
-            method.getInterface().addImport("javax.jws.Oneway");
-            return;
-        }
-
-        if ("void".equals(method.getReturn().getType())) {
-            return;
-        }
-        JavaAnnotation resultAnnotation = new JavaAnnotation("WebResult");
-        String targetNamespace = method.getReturn().getTargetNamespace();
-        String name = "return";
-
-        if (method.getSoapStyle() == SOAPBinding.Style.DOCUMENT && !method.isWrapperStyle()) {
-            name = method.getName() + "Response";
-        }
-
-        if (method.getSoapStyle() == SOAPBinding.Style.RPC) {
-            name = method.getReturn().getName();
-            targetNamespace = method.getInterface().getNamespace();
-           
-        }
-        if (method.getSoapStyle() == SOAPBinding.Style.DOCUMENT) {
-            if (method.getReturn().getQName() != null) {
-                name = method.getReturn().getQName().getLocalPart();
-            }
-            targetNamespace = method.getReturn().getTargetNamespace();
-        }
-
-        resultAnnotation.addArgument("name", name);
-        resultAnnotation.addArgument("targetNamespace", targetNamespace);
-
-        if (method.getSoapStyle() == SOAPBinding.Style.RPC
-            || (method.getSoapStyle() == SOAPBinding.Style.DOCUMENT && !method.isWrapperStyle())) {
-            resultAnnotation.addArgument("partName", method.getReturn().getName());
-        }
-
-        method.addAnnotation("WebResult", resultAnnotation);
-        method.getInterface().addImport("javax.jws.WebResult");
-    }
-
-    public void addWrapperAnnotation(JavaMethod method,
-                                     JavaParameter wrapperRequest,
-                                     JavaParameter wrapperResponse) {
-        if (wrapperRequest != null) {
-            JavaAnnotation wrapperRequestAnnotation = new JavaAnnotation("RequestWrapper");
-            wrapperRequestAnnotation.addArgument("localName", wrapperRequest.getType());
-            wrapperRequestAnnotation.addArgument("targetNamespace", wrapperRequest.getTargetNamespace());
-            wrapperRequestAnnotation.addArgument("className", wrapperRequest.getClassName());
-            method.addAnnotation("RequestWrapper", wrapperRequestAnnotation);
-            method.getInterface().addImport("javax.xml.ws.RequestWrapper");
-        }
-        if (wrapperResponse != null) {
-            JavaAnnotation wrapperResponseAnnotation = new JavaAnnotation("ResponseWrapper");
-            wrapperResponseAnnotation.addArgument("localName", wrapperResponse.getType());
-            wrapperResponseAnnotation.addArgument("targetNamespace", wrapperResponse.getTargetNamespace());
-            wrapperResponseAnnotation.addArgument("className", wrapperResponse.getClassName());
-            method.addAnnotation("ResponseWrapper", wrapperResponseAnnotation);
-            method.getInterface().addImport("javax.xml.ws.ResponseWrapper");
-        }
-
     }
 }

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotator.java Fri Jan  5 03:20:06 2007
@@ -22,14 +22,22 @@
 import javax.jws.soap.SOAPBinding;
 
 import org.apache.cxf.tools.common.model.Annotator;
+import org.apache.cxf.tools.common.model.JavaAnnotatable;
 import org.apache.cxf.tools.common.model.JavaAnnotation;
 import org.apache.cxf.tools.common.model.JavaMethod;
 import org.apache.cxf.tools.common.model.JavaParameter;
 import org.apache.cxf.tools.common.model.JavaType;
 
-public final class WebParamAnnotator implements Annotator {
-    
-    public void annotate(final JavaMethod method, JavaParameter parameter) {
+public class WebParamAnnotator implements Annotator {
+
+    public void annotate(JavaAnnotatable ja) {
+        JavaParameter parameter = null;
+        if (ja instanceof JavaParameter) {
+            parameter = (JavaParameter) ja;
+        } else {
+            throw new RuntimeException("WebParamAnnotator only annotate the JavaParameter");
+        }
+        JavaMethod method = parameter.getMethod();
         JavaAnnotation webParamAnnotation = new JavaAnnotation("WebParam");
         String name = parameter.getName();
         String targetNamespace = method.getInterface().getNamespace();

Added: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebResultAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebResultAnnotator.java?view=auto&rev=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebResultAnnotator.java (added)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebResultAnnotator.java Fri Jan  5 03:20:06 2007
@@ -0,0 +1,79 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator;
+
+import javax.jws.soap.SOAPBinding;
+import org.apache.cxf.tools.common.model.Annotator;
+import org.apache.cxf.tools.common.model.JavaAnnotatable;
+import org.apache.cxf.tools.common.model.JavaAnnotation;
+import org.apache.cxf.tools.common.model.JavaMethod;
+
+public class WebResultAnnotator implements Annotator {
+
+    public void annotate(JavaAnnotatable ja) {
+        JavaMethod method = null;
+        if (ja instanceof JavaMethod) {
+            method = (JavaMethod) ja;
+        } else {
+            throw new RuntimeException("WebResult can only annotate JavaMethod");
+        }
+            
+        if (method.isOneWay()) {
+            JavaAnnotation oneWayAnnotation = new JavaAnnotation("Oneway");
+            method.addAnnotation("Oneway", oneWayAnnotation);
+            method.getInterface().addImport("javax.jws.Oneway");
+            return;
+        }
+
+        if ("void".equals(method.getReturn().getType())) {
+            return;
+        }
+        JavaAnnotation resultAnnotation = new JavaAnnotation("WebResult");
+        String targetNamespace = method.getReturn().getTargetNamespace();
+        String name = "return";
+
+        if (method.getSoapStyle() == SOAPBinding.Style.DOCUMENT && !method.isWrapperStyle()) {
+            name = method.getName() + "Response";
+        }
+
+        if (method.getSoapStyle() == SOAPBinding.Style.RPC) {
+            name = method.getReturn().getName();
+            targetNamespace = method.getInterface().getNamespace();
+           
+        }
+        if (method.getSoapStyle() == SOAPBinding.Style.DOCUMENT) {
+            if (method.getReturn().getQName() != null) {
+                name = method.getReturn().getQName().getLocalPart();
+            }
+            targetNamespace = method.getReturn().getTargetNamespace();
+        }
+
+        resultAnnotation.addArgument("name", name);
+        resultAnnotation.addArgument("targetNamespace", targetNamespace);
+
+        if (method.getSoapStyle() == SOAPBinding.Style.RPC
+            || (method.getSoapStyle() == SOAPBinding.Style.DOCUMENT && !method.isWrapperStyle())) {
+            resultAnnotation.addArgument("partName", method.getReturn().getName());
+        }
+
+        method.addAnnotation("WebResult", resultAnnotation);
+        method.getInterface().addImport("javax.jws.WebResult");
+    }
+}

Propchange: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebResultAnnotator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebResultAnnotator.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java?view=diff&rev=492984&r1=492983&r2=492984
==============================================================================
--- incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java (original)
+++ incubator/cxf/trunk/tools2/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebServiceAnnotator.java Fri Jan  5 03:20:06 2007
@@ -20,12 +20,19 @@
 package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.annotator;
 
 import org.apache.cxf.tools.common.model.Annotator;
+import org.apache.cxf.tools.common.model.JavaAnnotatable;
 import org.apache.cxf.tools.common.model.JavaAnnotation;
 import org.apache.cxf.tools.common.model.JavaInterface;
 
 public final class WebServiceAnnotator implements Annotator {
     
-    public void annotate(JavaInterface intf) {
+    public void annotate(JavaAnnotatable  ja) {
+        JavaInterface intf = null;
+        if (ja instanceof JavaInterface) {
+            intf = (JavaInterface) ja;
+        } else {
+            throw new RuntimeException("WebService can only annotate JavaInterface");
+        }
         JavaAnnotation serviceAnnotation = new JavaAnnotation("WebService");
         serviceAnnotation.addArgument("targetNamespace", intf.getNamespace());
         serviceAnnotation.addArgument("wsdlLocation", intf.getLocation());



Mime
View raw message