cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r559909 [1/7] - in /incubator/cxf/trunk: benchmark/performance/soap_http_doc_lit/bin/ common/common/src/main/java/org/apache/cxf/configuration/spring/ common/common/src/main/java/org/apache/cxf/helpers/ rt/databinding/aegis/src/test/java/or...
Date Thu, 26 Jul 2007 17:57:59 GMT
Author: dkulp
Date: Thu Jul 26 10:57:46 2007
New Revision: 559909

URL: http://svn.apache.org/viewvc?view=rev&rev=559909
Log:
Fix svn properties (eol-style, etc...)

Modified:
    incubator/cxf/trunk/benchmark/performance/soap_http_doc_lit/bin/run_server.bat   (props changed)
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java   (props changed)
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java   (contents, props changed)
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java   (contents, props changed)
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java   (contents, props changed)
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java   (contents, props changed)
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/Server.java   (contents, props changed)
    incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service.wsdl   (contents, props changed)
    incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/anttask/pom.xml   (props changed)
    incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/CxfAntTask.java   (contents, props changed)
    incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSDLTask.java   (contents, props changed)
    incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/WSDL2JavaTask.java   (contents, props changed)
    incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml   (contents, props changed)
    incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java   (contents, props changed)
    incubator/cxf/trunk/tools/javato/core/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoCalendar.java   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoDate.java   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar.xjb   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar_embed.xml   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/Hello.java   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_calendar.xjb   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpc_lit.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_rpclist_no_sei.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomNodeSelector.java   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/jax-ws-catalog.xml   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/CatalogTest.java   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParserTest.java   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/expected/inline_jaxws.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/resources/embeded_jaxb.xjb   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/resources/external_jaxws.xml   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/resources/external_jaxws_embed_jaxb.xml   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/resources/external_jaxws_embed_jaxb_date.xml   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/resources/test.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/resources/test.xsd   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessorTest.java   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CatalogTest.java   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/DummyXjcPlugin.java   (props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/JAXWSBindingTest.java   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/META-INF/jax-ws-catalog.xml   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug765/hello_world.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/bug765/hello_world_ports.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf778/hello_world_recursive.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf778/hello_world_recursive_import.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf804/hello_world.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf804/hello_world_contains_import.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf805/hello_world_with_typo.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/echo_date.xjb   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/pizza_messages.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/pizza_schema.xml   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/pizza_wrapped.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/test_catalog.xml   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/test_catalog_messages.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/test_catalog_replaceme.wsdl   (contents, props changed)
    incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/test_catalog_service.wsdl   (contents, props changed)

Propchange: incubator/cxf/trunk/benchmark/performance/soap_http_doc_lit/bin/run_server.bat
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java Thu Jul 26 10:57:46 2007
@@ -1,83 +1,83 @@
-/**
- * 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.helpers;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import javax.xml.namespace.NamespaceContext;
-import org.w3c.dom.Node;
-
-public  final class MapNamespaceContext implements NamespaceContext {
-    private Map<String, String> namespaces = new HashMap<String, String>();
-    private Node targetNode;
-
-    public MapNamespaceContext() {
-        super();
-    }
-
-    public MapNamespaceContext(final Map<String, String> ns) {
-        this();
-        this.namespaces = ns;
-    }
-
-    public MapNamespaceContext(final Node node) {
-        this();
-        this.targetNode = node;
-    }
-
-    public void setTargetNode(final Node node) {
-        this.targetNode = node;
-    }
-
-    public void addNamespace(final String prefix, final String namespaceURI) {
-        this.namespaces.put(prefix, namespaceURI);
-    }
-
-    public void addNamespaces(final Map<String, String> ns) {
-        this.namespaces.putAll(ns);
-    }
-
-    public String getNamespaceURI(String prefix) {
-        if (targetNode != null) {
-            String s = targetNode.lookupNamespaceURI(prefix);
-            if (prefix != null && s != null) {
-                namespaces.put(prefix, s);
-            }
-        }
-        return namespaces.get(prefix);
-    }
-
-    public String getPrefix(String namespaceURI) {
-        for (Map.Entry<String, String> e : namespaces.entrySet()) {
-            if (e.getValue().equals(namespaceURI)) {
-                return e.getKey();
-            }
-        }
-        return null;
-    }
-
-    public Iterator getPrefixes(String namespaceURI) {
-        return null;
-    }
-
-    public Map<String, String> getUsedNamespaces() {
-        return namespaces;
-    }
-}
+/**
+ * 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.helpers;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import javax.xml.namespace.NamespaceContext;
+import org.w3c.dom.Node;
+
+public  final class MapNamespaceContext implements NamespaceContext {
+    private Map<String, String> namespaces = new HashMap<String, String>();
+    private Node targetNode;
+
+    public MapNamespaceContext() {
+        super();
+    }
+
+    public MapNamespaceContext(final Map<String, String> ns) {
+        this();
+        this.namespaces = ns;
+    }
+
+    public MapNamespaceContext(final Node node) {
+        this();
+        this.targetNode = node;
+    }
+
+    public void setTargetNode(final Node node) {
+        this.targetNode = node;
+    }
+
+    public void addNamespace(final String prefix, final String namespaceURI) {
+        this.namespaces.put(prefix, namespaceURI);
+    }
+
+    public void addNamespaces(final Map<String, String> ns) {
+        this.namespaces.putAll(ns);
+    }
+
+    public String getNamespaceURI(String prefix) {
+        if (targetNode != null) {
+            String s = targetNode.lookupNamespaceURI(prefix);
+            if (prefix != null && s != null) {
+                namespaces.put(prefix, s);
+            }
+        }
+        return namespaces.get(prefix);
+    }
+
+    public String getPrefix(String namespaceURI) {
+        for (Map.Entry<String, String> e : namespaces.entrySet()) {
+            if (e.getValue().equals(namespaceURI)) {
+                return e.getKey();
+            }
+        }
+        return null;
+    }
+
+    public Iterator getPrefixes(String namespaceURI) {
+        return null;
+    }
+
+    public Map<String, String> getUsedNamespaces() {
+        return namespaces;
+    }
+}

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java Thu Jul 26 10:57:46 2007
@@ -1,23 +1,23 @@
-/**
- * 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.aegis.type.java5.map;
-
-public class Student {
-
-}
+/**
+ * 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.aegis.type.java5.map;
+
+public class Student {
+
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java Thu Jul 26 10:57:46 2007
@@ -1,81 +1,81 @@
-/**
- * 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.systest.soapheader;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.pizza.Pizza;
-import org.apache.cxf.pizza.PizzaService;
-import org.apache.cxf.pizza.types.CallerIDHeaderType;
-import org.apache.cxf.pizza.types.OrderPizzaResponseType;
-import org.apache.cxf.pizza.types.OrderPizzaType;
-import org.apache.cxf.pizza.types.ToppingsListType;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class HeaderClientServerTest extends AbstractBusClientServerTestBase {
-
-    private final QName serviceName = new QName("http://cxf.apache.org/pizza", "PizzaService");
-
-    @BeforeClass
-    public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class));
-    }
-
-    @Test
-    @Ignore("Works in systests, but the wsdl2java will not load the soap module in the top level")
-    public void testBasicConnection() throws Exception {
-        Pizza port = getPort();
-
-        OrderPizzaType req = new OrderPizzaType();
-        ToppingsListType t = new ToppingsListType();
-        t.getTopping().add("test");
-        req.setToppings(t);
-
-        CallerIDHeaderType header = new CallerIDHeaderType();
-        header.setName("mao");
-        header.setPhoneNumber("108");
-
-        OrderPizzaResponseType res = port.orderPizza(req);
-        System.out.println(res);
-
-        //OrderPizzaResponseType res =  port.orderPizza(req, header);
-
-        //assertEquals(208, res.getMinutesUntilReady());
-    }
-
-    private Pizza getPort() {
-        URL wsdl = getClass().getResource("/wsdl/pizza_service.wsdl");
-        assertNotNull("WSDL is null", wsdl);
-
-        PizzaService service = new PizzaService(wsdl, serviceName);
-        assertNotNull("Service is ull ", service);
-
-        return service.getPizzaPort();
-    }
-
-}
-
+/**
+ * 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.systest.soapheader;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.pizza.Pizza;
+import org.apache.cxf.pizza.PizzaService;
+import org.apache.cxf.pizza.types.CallerIDHeaderType;
+import org.apache.cxf.pizza.types.OrderPizzaResponseType;
+import org.apache.cxf.pizza.types.OrderPizzaType;
+import org.apache.cxf.pizza.types.ToppingsListType;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class HeaderClientServerTest extends AbstractBusClientServerTestBase {
+
+    private final QName serviceName = new QName("http://cxf.apache.org/pizza", "PizzaService");
+
+    @BeforeClass
+    public static void startServers() throws Exception {
+        assertTrue("server did not launch correctly", launchServer(Server.class));
+    }
+
+    @Test
+    @Ignore("Works in systests, but the wsdl2java will not load the soap module in the top level")
+    public void testBasicConnection() throws Exception {
+        Pizza port = getPort();
+
+        OrderPizzaType req = new OrderPizzaType();
+        ToppingsListType t = new ToppingsListType();
+        t.getTopping().add("test");
+        req.setToppings(t);
+
+        CallerIDHeaderType header = new CallerIDHeaderType();
+        header.setName("mao");
+        header.setPhoneNumber("108");
+
+        OrderPizzaResponseType res = port.orderPizza(req);
+        System.out.println(res);
+
+        //OrderPizzaResponseType res =  port.orderPizza(req, header);
+
+        //assertEquals(208, res.getMinutesUntilReady());
+    }
+
+    private Pizza getPort() {
+        URL wsdl = getClass().getResource("/wsdl/pizza_service.wsdl");
+        assertNotNull("WSDL is null", wsdl);
+
+        PizzaService service = new PizzaService(wsdl, serviceName);
+        assertNotNull("Service is ull ", service);
+
+        return service.getPizzaPort();
+    }
+
+}
+

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java Thu Jul 26 10:57:46 2007
@@ -1,40 +1,40 @@
-/**
- * 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.systest.soapheader;
-
-import org.apache.cxf.pizza.Pizza;
-import org.apache.cxf.pizza.types.CallerIDHeaderType;
-import org.apache.cxf.pizza.types.OrderPizzaResponseType;
-import org.apache.cxf.pizza.types.OrderPizzaType;
-
-public class PizzaImpl implements Pizza {
-
-    public OrderPizzaResponseType orderPizza(OrderPizzaType body, CallerIDHeaderType callerID) {
-        OrderPizzaResponseType resp = new OrderPizzaResponseType();
-        resp.setMinutesUntilReady(100 + Integer.parseInt(callerID.getPhoneNumber()));
-        return resp;
-    }
-
-    public OrderPizzaResponseType orderPizza(OrderPizzaType body) {
-        OrderPizzaResponseType resp = new OrderPizzaResponseType();
-        resp.setMinutesUntilReady(108);
-        return resp;
-    }
-}
+/**
+ * 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.systest.soapheader;
+
+import org.apache.cxf.pizza.Pizza;
+import org.apache.cxf.pizza.types.CallerIDHeaderType;
+import org.apache.cxf.pizza.types.OrderPizzaResponseType;
+import org.apache.cxf.pizza.types.OrderPizzaType;
+
+public class PizzaImpl implements Pizza {
+
+    public OrderPizzaResponseType orderPizza(OrderPizzaType body, CallerIDHeaderType callerID) {
+        OrderPizzaResponseType resp = new OrderPizzaResponseType();
+        resp.setMinutesUntilReady(100 + Integer.parseInt(callerID.getPhoneNumber()));
+        return resp;
+    }
+
+    public OrderPizzaResponseType orderPizza(OrderPizzaType body) {
+        OrderPizzaResponseType resp = new OrderPizzaResponseType();
+        resp.setMinutesUntilReady(108);
+        return resp;
+    }
+}

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/PizzaImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/Server.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/Server.java Thu Jul 26 10:57:46 2007
@@ -1,45 +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.systest.soapheader;
-
-import javax.xml.ws.Endpoint;
-
-import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-
-public class Server extends AbstractBusTestServerBase {
-
-    protected void run()  {
-        Object implementor = new PizzaImpl();
-        String address = "http://localhost:9013/pizza_service/services/PizzaService";
-        Endpoint.publish(address, implementor);
-    }
-
-    public static void main(String[] args) {
-        try {
-            Server s = new Server();
-            s.start();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            System.exit(-1);
-        } finally {
-            System.out.println("done!");
-        }
-    }
-}
+/**
+ * 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.systest.soapheader;
+
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class Server extends AbstractBusTestServerBase {
+
+    protected void run()  {
+        Object implementor = new PizzaImpl();
+        String address = "http://localhost:9013/pizza_service/services/PizzaService";
+        Endpoint.publish(address, implementor);
+    }
+
+    public static void main(String[] args) {
+        try {
+            Server s = new Server();
+            s.start();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            System.exit(-1);
+        } finally {
+            System.out.println("done!");
+        }
+    }
+}

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/Server.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/soapheader/Server.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service.wsdl?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service.wsdl (original)
+++ incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service.wsdl Thu Jul 26 10:57:46 2007
@@ -1,105 +1,105 @@
-<?xml version="1.0" ?>
-<!--
-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="PizzaService"
-      targetNamespace="http://cxf.apache.org/pizza"
-      xmlns:tns="http://cxf.apache.org/pizza"
-      xmlns:types="http://cxf.apache.org/pizza/types"
-      xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-      xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-    <wsdl:types>
-      <xsd:schema targetNamespace="http://cxf.apache.org/pizza/types"
-                  xmlns:tns="http://cxf.apache.org/pizza/types"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                  elementFormDefault="qualified"
-                  version="1.0">
-
-        <xsd:element name="CallerIDHeader" type="tns:CallerIDHeaderType" />
-
-        <xsd:complexType name="CallerIDHeaderType">
-          <xsd:sequence>
-            <xsd:element name="Name" type="xsd:string" />
-            <xsd:element name="PhoneNumber" type="xsd:string" />
-          </xsd:sequence>
-        </xsd:complexType>
-
-        <xsd:element name="OrderRequest" type="tns:OrderPizzaType" />
-
-        <xsd:complexType name="OrderPizzaType">
-          <xsd:sequence>
-            <xsd:element name="Toppings" type="tns:ToppingsListType" />
-          </xsd:sequence>
-        </xsd:complexType>
-
-        <xsd:element name="OrderResponse" type="tns:OrderPizzaResponseType" />
-
-        <xsd:complexType name="OrderPizzaResponseType">
-          <xsd:sequence>
-            <xsd:element name="MinutesUntilReady" type="xsd:int" />
-          </xsd:sequence>
-        </xsd:complexType>
-
-        <xsd:complexType name="ToppingsListType">
-          <xsd:sequence>
-            <xsd:element name="Topping" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:schema>
-    </wsdl:types>
-
-    <wsdl:portType name="Pizza">
-      <wsdl:operation name="OrderPizza">
-        <wsdl:input message="tns:OrderPizzaRequest" />
-        <wsdl:output message="tns:OrderPizzaResponse" />
-      </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:message name="CallerIDHeader">
-      <wsdl:part name="callerID" element="types:CallerIDHeader"/>
-    </wsdl:message>
-
-    <wsdl:message name="OrderPizzaRequest">
-      <wsdl:part name="body" element="types:OrderRequest"/>
-    </wsdl:message>
-    <wsdl:message name="OrderPizzaResponse">
-      <wsdl:part name="body" element="types:OrderResponse"/>
-    </wsdl:message>
-
-  <wsdl:binding name="PizzaPortBinding" type="tns:Pizza">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <wsdl:operation name="OrderPizza">
-      <soap:operation soapAction=""/>
-      <wsdl:input>
-        <soap:header message="tns:CallerIDHeader" part="callerID" use="literal" />
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-
-  <wsdl:service name="PizzaService">
-    <wsdl:port name="PizzaPort" binding="tns:PizzaPortBinding">
-      <soap:address location="http://localhost:9013/pizza_service/services/PizzaService"/>
-    </wsdl:port>
-  </wsdl:service>
+<?xml version="1.0" ?>
+<!--
+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="PizzaService"
+      targetNamespace="http://cxf.apache.org/pizza"
+      xmlns:tns="http://cxf.apache.org/pizza"
+      xmlns:types="http://cxf.apache.org/pizza/types"
+      xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+      xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+    <wsdl:types>
+      <xsd:schema targetNamespace="http://cxf.apache.org/pizza/types"
+                  xmlns:tns="http://cxf.apache.org/pizza/types"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  elementFormDefault="qualified"
+                  version="1.0">
+
+        <xsd:element name="CallerIDHeader" type="tns:CallerIDHeaderType" />
+
+        <xsd:complexType name="CallerIDHeaderType">
+          <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string" />
+            <xsd:element name="PhoneNumber" type="xsd:string" />
+          </xsd:sequence>
+        </xsd:complexType>
+
+        <xsd:element name="OrderRequest" type="tns:OrderPizzaType" />
+
+        <xsd:complexType name="OrderPizzaType">
+          <xsd:sequence>
+            <xsd:element name="Toppings" type="tns:ToppingsListType" />
+          </xsd:sequence>
+        </xsd:complexType>
+
+        <xsd:element name="OrderResponse" type="tns:OrderPizzaResponseType" />
+
+        <xsd:complexType name="OrderPizzaResponseType">
+          <xsd:sequence>
+            <xsd:element name="MinutesUntilReady" type="xsd:int" />
+          </xsd:sequence>
+        </xsd:complexType>
+
+        <xsd:complexType name="ToppingsListType">
+          <xsd:sequence>
+            <xsd:element name="Topping" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:schema>
+    </wsdl:types>
+
+    <wsdl:portType name="Pizza">
+      <wsdl:operation name="OrderPizza">
+        <wsdl:input message="tns:OrderPizzaRequest" />
+        <wsdl:output message="tns:OrderPizzaResponse" />
+      </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:message name="CallerIDHeader">
+      <wsdl:part name="callerID" element="types:CallerIDHeader"/>
+    </wsdl:message>
+
+    <wsdl:message name="OrderPizzaRequest">
+      <wsdl:part name="body" element="types:OrderRequest"/>
+    </wsdl:message>
+    <wsdl:message name="OrderPizzaResponse">
+      <wsdl:part name="body" element="types:OrderResponse"/>
+    </wsdl:message>
+
+  <wsdl:binding name="PizzaPortBinding" type="tns:Pizza">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <wsdl:operation name="OrderPizza">
+      <soap:operation soapAction=""/>
+      <wsdl:input>
+        <soap:header message="tns:CallerIDHeader" part="callerID" use="literal" />
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+
+  <wsdl:service name="PizzaService">
+    <wsdl:port name="PizzaPort" binding="tns:PizzaPortBinding">
+      <soap:address location="http://localhost:9013/pizza_service/services/PizzaService"/>
+    </wsdl:port>
+  </wsdl:service>
 </wsdl:definitions>

Propchange: incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl (original)
+++ incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl Thu Jul 26 10:57:46 2007
@@ -1,105 +1,105 @@
-<?xml version="1.0" ?>
-<!--
-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="PizzaService"
-      targetNamespace="http://cxf.apache.org/pizza_wrapped"
-      xmlns:tns="http://cxf.apache.org/pizza_wrapped"
-      xmlns:types="http://cxf.apache.org/pizza_wrapped/types"
-      xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-      xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-    <wsdl:types>
-      <xsd:schema targetNamespace="http://cxf.apache.org/pizza_wrapped/types"
-                  xmlns:tns="http://cxf.apache.org/pizza_wrapped/types"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                  elementFormDefault="qualified"
-                  version="1.0">
-
-        <xsd:element name="CallerIDHeader" type="tns:CallerIDHeaderType" />
-
-        <xsd:complexType name="CallerIDHeaderType">
-          <xsd:sequence>
-            <xsd:element name="Name" type="xsd:string" />
-            <xsd:element name="PhoneNumber" type="xsd:string" />
-          </xsd:sequence>
-        </xsd:complexType>
-
-        <xsd:element name="OrderPizza" type="tns:OrderPizzaType" />
-
-        <xsd:complexType name="OrderPizzaType">
-          <xsd:sequence>
-            <xsd:element name="Toppings" type="tns:ToppingsListType" />
-          </xsd:sequence>
-        </xsd:complexType>
-
-        <xsd:element name="OrderPizzaResponse" type="tns:OrderPizzaResponseType" />
-
-        <xsd:complexType name="OrderPizzaResponseType">
-          <xsd:sequence>
-            <xsd:element name="MinutesUntilReady" type="xsd:int" />
-          </xsd:sequence>
-        </xsd:complexType>
-
-        <xsd:complexType name="ToppingsListType">
-          <xsd:sequence>
-            <xsd:element name="Topping" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:schema>
-    </wsdl:types>
-
-    <wsdl:portType name="Pizza">
-      <wsdl:operation name="OrderPizza">
-        <wsdl:input message="tns:OrderPizzaRequest" />
-        <wsdl:output message="tns:OrderPizzaResponse" />
-      </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:message name="CallerIDHeader">
-      <wsdl:part name="callerID" element="types:CallerIDHeader"/>
-    </wsdl:message>
-
-    <wsdl:message name="OrderPizzaRequest">
-      <wsdl:part name="body" element="types:OrderPizza"/>
-    </wsdl:message>
-    <wsdl:message name="OrderPizzaResponse">
-      <wsdl:part name="body" element="types:OrderPizzaResponse"/>
-    </wsdl:message>
-
-  <wsdl:binding name="PizzaPortBinding" type="tns:Pizza">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <wsdl:operation name="OrderPizza">
-      <soap:operation soapAction=""/>
-      <wsdl:input>
-        <soap:header message="tns:CallerIDHeader" part="callerID" use="literal" />
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-
-  <wsdl:service name="PizzaService">
-    <wsdl:port name="PizzaPort" binding="tns:PizzaPortBinding">
-      <soap:address location="http://localhost:9013/pizza_service/services/PizzaService"/>
-    </wsdl:port>
-  </wsdl:service>
+<?xml version="1.0" ?>
+<!--
+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="PizzaService"
+      targetNamespace="http://cxf.apache.org/pizza_wrapped"
+      xmlns:tns="http://cxf.apache.org/pizza_wrapped"
+      xmlns:types="http://cxf.apache.org/pizza_wrapped/types"
+      xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+      xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+    <wsdl:types>
+      <xsd:schema targetNamespace="http://cxf.apache.org/pizza_wrapped/types"
+                  xmlns:tns="http://cxf.apache.org/pizza_wrapped/types"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  elementFormDefault="qualified"
+                  version="1.0">
+
+        <xsd:element name="CallerIDHeader" type="tns:CallerIDHeaderType" />
+
+        <xsd:complexType name="CallerIDHeaderType">
+          <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string" />
+            <xsd:element name="PhoneNumber" type="xsd:string" />
+          </xsd:sequence>
+        </xsd:complexType>
+
+        <xsd:element name="OrderPizza" type="tns:OrderPizzaType" />
+
+        <xsd:complexType name="OrderPizzaType">
+          <xsd:sequence>
+            <xsd:element name="Toppings" type="tns:ToppingsListType" />
+          </xsd:sequence>
+        </xsd:complexType>
+
+        <xsd:element name="OrderPizzaResponse" type="tns:OrderPizzaResponseType" />
+
+        <xsd:complexType name="OrderPizzaResponseType">
+          <xsd:sequence>
+            <xsd:element name="MinutesUntilReady" type="xsd:int" />
+          </xsd:sequence>
+        </xsd:complexType>
+
+        <xsd:complexType name="ToppingsListType">
+          <xsd:sequence>
+            <xsd:element name="Topping" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:schema>
+    </wsdl:types>
+
+    <wsdl:portType name="Pizza">
+      <wsdl:operation name="OrderPizza">
+        <wsdl:input message="tns:OrderPizzaRequest" />
+        <wsdl:output message="tns:OrderPizzaResponse" />
+      </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:message name="CallerIDHeader">
+      <wsdl:part name="callerID" element="types:CallerIDHeader"/>
+    </wsdl:message>
+
+    <wsdl:message name="OrderPizzaRequest">
+      <wsdl:part name="body" element="types:OrderPizza"/>
+    </wsdl:message>
+    <wsdl:message name="OrderPizzaResponse">
+      <wsdl:part name="body" element="types:OrderPizzaResponse"/>
+    </wsdl:message>
+
+  <wsdl:binding name="PizzaPortBinding" type="tns:Pizza">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <wsdl:operation name="OrderPizza">
+      <soap:operation soapAction=""/>
+      <wsdl:input>
+        <soap:header message="tns:CallerIDHeader" part="callerID" use="literal" />
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+
+  <wsdl:service name="PizzaService">
+    <wsdl:port name="PizzaPort" binding="tns:PizzaPortBinding">
+      <soap:address location="http://localhost:9013/pizza_service/services/PizzaService"/>
+    </wsdl:port>
+  </wsdl:service>
 </wsdl:definitions>

Propchange: incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/systests/src/test/resources/wsdl/pizza_service_wrapped.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: incubator/cxf/trunk/tools/anttask/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/anttask/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/anttask/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/CxfAntTask.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/CxfAntTask.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/CxfAntTask.java (original)
+++ incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/CxfAntTask.java Thu Jul 26 10:57:46 2007
@@ -1,58 +1,58 @@
-/**
- * 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.ant.extensions;
-
-import java.io.File;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-
-public class CxfAntTask extends Task {
-    protected boolean verbose;
-    protected CommandlineJava cmd = new CommandlineJava();
-    protected File classesDir;
-    protected File sourcesDir;
-
-    public void setFork(boolean b) {
-        //we always fork, but the silly TCK requires this param for some reason
-    }
-    public void setKeep(boolean b) {
-        //we always "keep", but TCK requires this flag
-    }
-    public void setDebug(boolean b) {
-        // TCK requires this flag
-    }
-
-    public void setVerbose(boolean b) {
-        verbose = b;
-    }
-
-    public Commandline.Argument createJvmarg() {
-        return cmd.createVmArgument();
-    }
-
-    public void setSourceDestDir(File f) {
-        sourcesDir = f;
-    }
-
-    public void setDestdir(File c) {
-        classesDir = c;
-    }
-
+/**
+ * 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.ant.extensions;
+
+import java.io.File;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.CommandlineJava;
+
+public class CxfAntTask extends Task {
+    protected boolean verbose;
+    protected CommandlineJava cmd = new CommandlineJava();
+    protected File classesDir;
+    protected File sourcesDir;
+
+    public void setFork(boolean b) {
+        //we always fork, but the silly TCK requires this param for some reason
+    }
+    public void setKeep(boolean b) {
+        //we always "keep", but TCK requires this flag
+    }
+    public void setDebug(boolean b) {
+        // TCK requires this flag
+    }
+
+    public void setVerbose(boolean b) {
+        verbose = b;
+    }
+
+    public Commandline.Argument createJvmarg() {
+        return cmd.createVmArgument();
+    }
+
+    public void setSourceDestDir(File f) {
+        sourcesDir = f;
+    }
+
+    public void setDestdir(File c) {
+        classesDir = c;
+    }
+
 }

Propchange: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/CxfAntTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/CxfAntTask.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSDLTask.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSDLTask.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSDLTask.java (original)
+++ incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSDLTask.java Thu Jul 26 10:57:46 2007
@@ -1,146 +1,146 @@
-/**
- * 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.ant.extensions;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.tools.java2wsdl.JavaToWSDL;
-import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Execute;
-import org.apache.tools.ant.taskdefs.LogStreamHandler;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.Reference;
-
-public class Java2WSDLTask extends CxfAntTask {
-
-    private Path classpath;
-
-    private File wsdlDir;
-    private String protocol;
-    private String className;
-
-    public void setGenwsdl(boolean gw) {
-        //the point of this is to gen the wsdl, always do it
-    }
-
-    public Path createClasspath() {
-        if (classpath == null) {
-            classpath = new Path(getProject());
-        }
-        return classpath.createPath();
-    }
-    public void setClasspath(Path c) {
-        if (classpath == null) {
-            classpath = c;
-        } else {
-            classpath.append(c);
-        }
-    }
-    public void setClasspathRef(Reference r) {
-        createClasspath().setRefid(r);
-    }
-
-
-    public void setProtocol(String p) {
-        protocol = p;
-    }
-
-    public void setResourcedestdir(File f) {
-        wsdlDir = f;
-    }
-
-    public void setSei(String clz) {
-        className = clz;
-    }
-
-    public void execute() throws BuildException {
-        buildCommandLine();
-
-        LogStreamHandler log = new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN);
-        Execute exe = new Execute(log);
-        exe.setAntRun(getProject());
-        exe.setCommandline(cmd.getCommandline());
-        try {
-            int rc = exe.execute();
-            if (exe.killedProcess()
-                || rc != 0) {
-                throw new BuildException("java2wsdl failed", getLocation());
-            }
-        } catch (IOException e) {
-            throw new BuildException(e, getLocation());
-        }
-    }
-
-    public void buildCommandLine() {
-        ClassLoader loader = this.getClass().getClassLoader();
-        Path runCp = new Path(getProject());
-        if (loader instanceof AntClassLoader) {
-            runCp = new Path(getProject(), ((AntClassLoader)loader).getClasspath());
-        }
-        cmd.createClasspath(getProject()).append(runCp);
-        cmd.createVmArgument().setLine("-Djava.util.logging.config.file=");
-
-        cmd.setClassname(JavaToWSDL.class.getName());
-
-        if (classpath != null && !classpath.toString().equals("")) {
-            cmd.createArgument().setValue("-cp");
-            cmd.createArgument().setPath(classpath);
-        }
-
-
-        if (null != classesDir
-            && !StringUtils.isEmpty(classesDir.getName())) {
-            cmd.createArgument().setValue("-classdir");
-            cmd.createArgument().setFile(classesDir);
-        }
-        if (null != sourcesDir
-            && !StringUtils.isEmpty(sourcesDir.getName())) {
-            cmd.createArgument().setValue("-s");
-            cmd.createArgument().setFile(sourcesDir);
-        }
-
-        // verbose option
-        if (verbose) {
-            cmd.createArgument().setValue("-verbose");
-        }
-
-        if ("Xsoap1.2".equals(protocol)) {
-            cmd.createArgument().setValue("-soap12");
-        }
-
-        cmd.createArgument().setValue("-createxsdimports");
-
-        if (null != wsdlDir
-            && !StringUtils.isEmpty(wsdlDir.getName())) {
-            cmd.createArgument().setValue("-d");
-            cmd.createArgument().setFile(wsdlDir);
-        }
-
-
-        if (!StringUtils.isEmpty(className)) {
-            cmd.createArgument().setValue(className);
-        }
-    }
-}
+/**
+ * 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.ant.extensions;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.tools.java2wsdl.JavaToWSDL;
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.CommandlineJava;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
+
+public class Java2WSDLTask extends CxfAntTask {
+
+    private Path classpath;
+
+    private File wsdlDir;
+    private String protocol;
+    private String className;
+
+    public void setGenwsdl(boolean gw) {
+        //the point of this is to gen the wsdl, always do it
+    }
+
+    public Path createClasspath() {
+        if (classpath == null) {
+            classpath = new Path(getProject());
+        }
+        return classpath.createPath();
+    }
+    public void setClasspath(Path c) {
+        if (classpath == null) {
+            classpath = c;
+        } else {
+            classpath.append(c);
+        }
+    }
+    public void setClasspathRef(Reference r) {
+        createClasspath().setRefid(r);
+    }
+
+
+    public void setProtocol(String p) {
+        protocol = p;
+    }
+
+    public void setResourcedestdir(File f) {
+        wsdlDir = f;
+    }
+
+    public void setSei(String clz) {
+        className = clz;
+    }
+
+    public void execute() throws BuildException {
+        buildCommandLine();
+
+        LogStreamHandler log = new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN);
+        Execute exe = new Execute(log);
+        exe.setAntRun(getProject());
+        exe.setCommandline(cmd.getCommandline());
+        try {
+            int rc = exe.execute();
+            if (exe.killedProcess()
+                || rc != 0) {
+                throw new BuildException("java2wsdl failed", getLocation());
+            }
+        } catch (IOException e) {
+            throw new BuildException(e, getLocation());
+        }
+    }
+
+    public void buildCommandLine() {
+        ClassLoader loader = this.getClass().getClassLoader();
+        Path runCp = new Path(getProject());
+        if (loader instanceof AntClassLoader) {
+            runCp = new Path(getProject(), ((AntClassLoader)loader).getClasspath());
+        }
+        cmd.createClasspath(getProject()).append(runCp);
+        cmd.createVmArgument().setLine("-Djava.util.logging.config.file=");
+
+        cmd.setClassname(JavaToWSDL.class.getName());
+
+        if (classpath != null && !classpath.toString().equals("")) {
+            cmd.createArgument().setValue("-cp");
+            cmd.createArgument().setPath(classpath);
+        }
+
+
+        if (null != classesDir
+            && !StringUtils.isEmpty(classesDir.getName())) {
+            cmd.createArgument().setValue("-classdir");
+            cmd.createArgument().setFile(classesDir);
+        }
+        if (null != sourcesDir
+            && !StringUtils.isEmpty(sourcesDir.getName())) {
+            cmd.createArgument().setValue("-s");
+            cmd.createArgument().setFile(sourcesDir);
+        }
+
+        // verbose option
+        if (verbose) {
+            cmd.createArgument().setValue("-verbose");
+        }
+
+        if ("Xsoap1.2".equals(protocol)) {
+            cmd.createArgument().setValue("-soap12");
+        }
+
+        cmd.createArgument().setValue("-createxsdimports");
+
+        if (null != wsdlDir
+            && !StringUtils.isEmpty(wsdlDir.getName())) {
+            cmd.createArgument().setValue("-d");
+            cmd.createArgument().setFile(wsdlDir);
+        }
+
+
+        if (!StringUtils.isEmpty(className)) {
+            cmd.createArgument().setValue(className);
+        }
+    }
+}

Propchange: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSDLTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/Java2WSDLTask.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/WSDL2JavaTask.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/WSDL2JavaTask.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/WSDL2JavaTask.java (original)
+++ incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/WSDL2JavaTask.java Thu Jul 26 10:57:46 2007
@@ -1,125 +1,125 @@
-/**
- * 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.ant.extensions;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.tools.wsdlto.WSDLToJava;
-import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Execute;
-import org.apache.tools.ant.taskdefs.LogStreamHandler;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Path;
-
-public class WSDL2JavaTask extends CxfAntTask{
-
-    private String wsdlLocation;
-    private String wsdl;
-    private Set<File> bindingFiles = new HashSet<File>();
-
-    public void setWsdlLocation(String w) {
-        wsdlLocation = w;
-    }
-    public void setWsdl(String w) {
-        wsdl = w;
-    }
-    public void addConfiguredBinding(FileSet fs) {
-        DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-        String[] includedFiles = ds.getIncludedFiles();
-        File baseDir = ds.getBasedir();
-        for (int i = 0; i < includedFiles.length; ++i) {
-            bindingFiles.add(new File(baseDir, includedFiles[i]));
-        }
-    }
-
-    public void execute() throws BuildException {
-        buildCommandLine();
-
-        LogStreamHandler log = new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN);
-        Execute exe = new Execute(log);
-        exe.setAntRun(getProject());
-        exe.setCommandline(cmd.getCommandline());
-        try {
-            int rc = exe.execute();
-            if (exe.killedProcess()
-                || rc != 0) {
-                throw new BuildException("wsdl2java failed", getLocation());
-            }
-        } catch (IOException e) {
-            throw new BuildException(e, getLocation());
-        }
-    }
-
-    private void buildCommandLine() {
-        ClassLoader loader = this.getClass().getClassLoader();
-        Path classpath = new Path(getProject());
-        if (loader instanceof AntClassLoader) {
-            classpath = new Path(getProject(), ((AntClassLoader)loader).getClasspath());
-        }
-        cmd.createClasspath(getProject()).append(classpath);
-        cmd.createVmArgument().setLine("-Djava.util.logging.config.file=");
-
-        cmd.setClassname(WSDLToJava.class.getName());
-
-
-        if (null != classesDir
-            && !StringUtils.isEmpty(classesDir.getName())) {
-            cmd.createArgument().setValue("-classdir");
-            cmd.createArgument().setFile(classesDir);
-            cmd.createArgument().setValue("-compile");
-        }
-        if (null != sourcesDir
-            && !StringUtils.isEmpty(sourcesDir.getName())) {
-            cmd.createArgument().setValue("-d");
-            cmd.createArgument().setFile(sourcesDir);
-        }
-
-        // verbose option
-        if (verbose) {
-            cmd.createArgument().setValue("-verbose");
-        }
-
-        if (!bindingFiles.isEmpty()) {
-            for (File b : bindingFiles) {
-                cmd.createArgument().setValue("-b");
-                cmd.createArgument().setFile(b);
-            }
-        }
-
-        if (!StringUtils.isEmpty(wsdlLocation)) {
-            cmd.createArgument().setValue("-wsdlLocation");
-            cmd.createArgument().setValue(wsdlLocation);
-        }
-
-        // wsdl
-        if (!StringUtils.isEmpty(wsdl)) {
-            cmd.createArgument().setValue(wsdl);
-        }
-    }
+/**
+ * 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.ant.extensions;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.tools.wsdlto.WSDLToJava;
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.CommandlineJava;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Path;
+
+public class WSDL2JavaTask extends CxfAntTask{
+
+    private String wsdlLocation;
+    private String wsdl;
+    private Set<File> bindingFiles = new HashSet<File>();
+
+    public void setWsdlLocation(String w) {
+        wsdlLocation = w;
+    }
+    public void setWsdl(String w) {
+        wsdl = w;
+    }
+    public void addConfiguredBinding(FileSet fs) {
+        DirectoryScanner ds = fs.getDirectoryScanner(getProject());
+        String[] includedFiles = ds.getIncludedFiles();
+        File baseDir = ds.getBasedir();
+        for (int i = 0; i < includedFiles.length; ++i) {
+            bindingFiles.add(new File(baseDir, includedFiles[i]));
+        }
+    }
+
+    public void execute() throws BuildException {
+        buildCommandLine();
+
+        LogStreamHandler log = new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN);
+        Execute exe = new Execute(log);
+        exe.setAntRun(getProject());
+        exe.setCommandline(cmd.getCommandline());
+        try {
+            int rc = exe.execute();
+            if (exe.killedProcess()
+                || rc != 0) {
+                throw new BuildException("wsdl2java failed", getLocation());
+            }
+        } catch (IOException e) {
+            throw new BuildException(e, getLocation());
+        }
+    }
+
+    private void buildCommandLine() {
+        ClassLoader loader = this.getClass().getClassLoader();
+        Path classpath = new Path(getProject());
+        if (loader instanceof AntClassLoader) {
+            classpath = new Path(getProject(), ((AntClassLoader)loader).getClasspath());
+        }
+        cmd.createClasspath(getProject()).append(classpath);
+        cmd.createVmArgument().setLine("-Djava.util.logging.config.file=");
+
+        cmd.setClassname(WSDLToJava.class.getName());
+
+
+        if (null != classesDir
+            && !StringUtils.isEmpty(classesDir.getName())) {
+            cmd.createArgument().setValue("-classdir");
+            cmd.createArgument().setFile(classesDir);
+            cmd.createArgument().setValue("-compile");
+        }
+        if (null != sourcesDir
+            && !StringUtils.isEmpty(sourcesDir.getName())) {
+            cmd.createArgument().setValue("-d");
+            cmd.createArgument().setFile(sourcesDir);
+        }
+
+        // verbose option
+        if (verbose) {
+            cmd.createArgument().setValue("-verbose");
+        }
+
+        if (!bindingFiles.isEmpty()) {
+            for (File b : bindingFiles) {
+                cmd.createArgument().setValue("-b");
+                cmd.createArgument().setFile(b);
+            }
+        }
+
+        if (!StringUtils.isEmpty(wsdlLocation)) {
+            cmd.createArgument().setValue("-wsdlLocation");
+            cmd.createArgument().setValue(wsdlLocation);
+        }
+
+        // wsdl
+        if (!StringUtils.isEmpty(wsdl)) {
+            cmd.createArgument().setValue(wsdl);
+        }
+    }
 }

Propchange: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/WSDL2JavaTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/WSDL2JavaTask.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml (original)
+++ incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml Thu Jul 26 10:57:46 2007
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
-<!--
-  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.
--->
-
-<antlib>
-    <taskdef name="wsdl2java"
-             classname="org.apache.cxf.ant.extensions.WSDL2JavaTask"/>
-    <taskdef name="java2wsdl"
-             classname="org.apache.cxf.ant.extensions.Java2WSDLTask"/>
+<?xml version="1.0"?>
+<!--
+  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.
+-->
+
+<antlib>
+    <taskdef name="wsdl2java"
+             classname="org.apache.cxf.ant.extensions.WSDL2JavaTask"/>
+    <taskdef name="java2wsdl"
+             classname="org.apache.cxf.ant.extensions.Java2WSDLTask"/>
 </antlib>

Propchange: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/tools/anttask/src/main/java/org/apache/cxf/ant/extensions/antlib.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java Thu Jul 26 10:57:46 2007
@@ -1,55 +1,55 @@
-/**
- * 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;
-
-import java.util.Calendar;
-import java.util.Date;
-import javax.xml.bind.DatatypeConverter;
-
-public final class DataTypeAdapter {
-    private DataTypeAdapter() {
-    }
-
-    public static Date parseDate(String s) {
-        return DatatypeConverter.parseDate(s).getTime();
-    }
-    public static String printDate(Date dt) {
-        Calendar c = Calendar.getInstance();
-        c.setTime(dt);
-        return DatatypeConverter.printDate(c);
-    }
-
-    public static Date parseTime(String s) {
-        return DatatypeConverter.parseTime(s).getTime();
-    }
-    public static String printTime(Date dt) {
-        Calendar c = Calendar.getInstance();
-        c.setTime(dt);
-        return DatatypeConverter.printTime(c);
-    }
-
-    public static Date parseDateTime(String s) {
-        return DatatypeConverter.parseDateTime(s).getTime();
-    }
-    public static String printDateTime(Date dt) {
-        Calendar c = Calendar.getInstance();
-        c.setTime(dt);
-        return DatatypeConverter.printDateTime(c);
-    }
+/**
+ * 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;
+
+import java.util.Calendar;
+import java.util.Date;
+import javax.xml.bind.DatatypeConverter;
+
+public final class DataTypeAdapter {
+    private DataTypeAdapter() {
+    }
+
+    public static Date parseDate(String s) {
+        return DatatypeConverter.parseDate(s).getTime();
+    }
+    public static String printDate(Date dt) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(dt);
+        return DatatypeConverter.printDate(c);
+    }
+
+    public static Date parseTime(String s) {
+        return DatatypeConverter.parseTime(s).getTime();
+    }
+    public static String printTime(Date dt) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(dt);
+        return DatatypeConverter.printTime(c);
+    }
+
+    public static Date parseDateTime(String s) {
+        return DatatypeConverter.parseDateTime(s).getTime();
+    }
+    public static String printDateTime(Date dt) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(dt);
+        return DatatypeConverter.printDateTime(c);
+    }
 }

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

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



Mime
View raw message