You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/07/26 19:57:59 UTC
svn commit: r559909 [2/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...
Modified: incubator/cxf/trunk/tools/javato/core/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/core/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/core/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java (original)
+++ incubator/cxf/trunk/tools/javato/core/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java Thu Jul 26 10:57:46 2007
@@ -1,137 +1,137 @@
-/**
- * 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.java2wsdl.generator.wsdl11;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.cxf.service.model.OperationInfo;
-import org.apache.cxf.service.model.SchemaInfo;
-import org.apache.cxf.tools.common.VelocityGenerator;
-import org.apache.cxf.tools.java2wsdl.generator.AbstractGenerator;
-import org.apache.cxf.tools.util.FileWriterUtil;
-
-public final class DateTypeCustomGenerator extends AbstractGenerator<File> {
-
- private static final String TEMPLATE_BASE = "org/apache/cxf/tools/java2wsdl/generator/wsdl11/";
- private static final String TEMPLATE_EXT = TEMPLATE_BASE + "date_type_cust.vm";
- private static final String TEMPLATE_EMB = TEMPLATE_BASE + "date_type_cust_embed.vm";
-
- private static final String DATE_ADAPTER = "org.apache.cxf.tools.common.DataTypeAdapter";
- private static final String CALENDAR_ADAPTER = "javax.xml.bind.DatatypeConverter";
-
- private String wsdlName;
- private List<String> schemaFiles = new ArrayList<String>();
-
- public void addSchemaFiles(final Collection<String> s) {
- this.schemaFiles.addAll(s);
- }
-
- public void setWSDLName(final String ws) {
- this.wsdlName = ws;
- }
-
- private String getTemplate() {
- if (allowImports()) {
- return TEMPLATE_EXT;
- }
- return TEMPLATE_EMB;
- }
-
- public List<String> getSchemaNamespaces() {
- List<String> ns = new ArrayList<String>();
- for (SchemaInfo schema : getServiceModel().getSchemas()) {
- ns.add(schema.getNamespaceURI());
- }
- return ns;
- }
-
- public File generate(File outputdir) {
- Class dateType = getDateType();
- File xjb = getJAXBCustFile(outputdir);
-
- if (dateType != null) {
- VelocityGenerator generator = new VelocityGenerator();
-
- generator.setCommonAttributes();
- generator.setAttributes("parseMethod", getAdapterMethod(dateType, ".parseDateTime"));
- generator.setAttributes("printMethod", getAdapterMethod(dateType, ".printDateTime"));
- generator.setAttributes("datetype", dateType.getName());
-
- if (allowImports()) {
- if (schemaFiles.size() == 0) {
- return null;
- }
- generator.setAttributes("schemaFiles", schemaFiles);
- } else {
- generator.setAttributes("wsdlName", wsdlName);
- List<String> ns = getSchemaNamespaces();
- if (ns.size() == 0) {
- return null;
- }
- generator.setAttributes("targetNamespaces", ns);
- }
-
- try {
- generator.doWrite(getTemplate(), FileWriterUtil.getWriter(xjb));
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- generator.clearAttributes();
- }
- return xjb;
- }
-
- protected File getJAXBCustFile(File outputdir) {
- return new File(outputdir, wsdlName + ".xjb");
- }
-
- protected String getAdapterMethod(final Class clz, final String methodName) {
- if (clz == Date.class) {
- return DATE_ADAPTER + methodName;
- }
- return CALENDAR_ADAPTER + methodName;
- }
-
- protected Class getDateType() {
- if (getServiceModel() == null) {
- return null;
- }
-
- for (OperationInfo op : getServiceModel().getInterface().getOperations()) {
- Method m = (Method) op.getProperty("operation.method");
- for (Class clz : m.getParameterTypes()) {
- if (clz == Date.class || clz == Calendar.class) {
- return clz;
- }
- }
- if (m.getReturnType() == Date.class
- || m.getReturnType() == Calendar.class) {
- return m.getReturnType();
- }
- }
- return null;
- }
-}
+/**
+ * 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.java2wsdl.generator.wsdl11;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.service.model.SchemaInfo;
+import org.apache.cxf.tools.common.VelocityGenerator;
+import org.apache.cxf.tools.java2wsdl.generator.AbstractGenerator;
+import org.apache.cxf.tools.util.FileWriterUtil;
+
+public final class DateTypeCustomGenerator extends AbstractGenerator<File> {
+
+ private static final String TEMPLATE_BASE = "org/apache/cxf/tools/java2wsdl/generator/wsdl11/";
+ private static final String TEMPLATE_EXT = TEMPLATE_BASE + "date_type_cust.vm";
+ private static final String TEMPLATE_EMB = TEMPLATE_BASE + "date_type_cust_embed.vm";
+
+ private static final String DATE_ADAPTER = "org.apache.cxf.tools.common.DataTypeAdapter";
+ private static final String CALENDAR_ADAPTER = "javax.xml.bind.DatatypeConverter";
+
+ private String wsdlName;
+ private List<String> schemaFiles = new ArrayList<String>();
+
+ public void addSchemaFiles(final Collection<String> s) {
+ this.schemaFiles.addAll(s);
+ }
+
+ public void setWSDLName(final String ws) {
+ this.wsdlName = ws;
+ }
+
+ private String getTemplate() {
+ if (allowImports()) {
+ return TEMPLATE_EXT;
+ }
+ return TEMPLATE_EMB;
+ }
+
+ public List<String> getSchemaNamespaces() {
+ List<String> ns = new ArrayList<String>();
+ for (SchemaInfo schema : getServiceModel().getSchemas()) {
+ ns.add(schema.getNamespaceURI());
+ }
+ return ns;
+ }
+
+ public File generate(File outputdir) {
+ Class dateType = getDateType();
+ File xjb = getJAXBCustFile(outputdir);
+
+ if (dateType != null) {
+ VelocityGenerator generator = new VelocityGenerator();
+
+ generator.setCommonAttributes();
+ generator.setAttributes("parseMethod", getAdapterMethod(dateType, ".parseDateTime"));
+ generator.setAttributes("printMethod", getAdapterMethod(dateType, ".printDateTime"));
+ generator.setAttributes("datetype", dateType.getName());
+
+ if (allowImports()) {
+ if (schemaFiles.size() == 0) {
+ return null;
+ }
+ generator.setAttributes("schemaFiles", schemaFiles);
+ } else {
+ generator.setAttributes("wsdlName", wsdlName);
+ List<String> ns = getSchemaNamespaces();
+ if (ns.size() == 0) {
+ return null;
+ }
+ generator.setAttributes("targetNamespaces", ns);
+ }
+
+ try {
+ generator.doWrite(getTemplate(), FileWriterUtil.getWriter(xjb));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ generator.clearAttributes();
+ }
+ return xjb;
+ }
+
+ protected File getJAXBCustFile(File outputdir) {
+ return new File(outputdir, wsdlName + ".xjb");
+ }
+
+ protected String getAdapterMethod(final Class clz, final String methodName) {
+ if (clz == Date.class) {
+ return DATE_ADAPTER + methodName;
+ }
+ return CALENDAR_ADAPTER + methodName;
+ }
+
+ protected Class getDateType() {
+ if (getServiceModel() == null) {
+ return null;
+ }
+
+ for (OperationInfo op : getServiceModel().getInterface().getOperations()) {
+ Method m = (Method) op.getProperty("operation.method");
+ for (Class clz : m.getParameterTypes()) {
+ if (clz == Date.class || clz == Calendar.class) {
+ return clz;
+ }
+ }
+ if (m.getReturnType() == Date.class
+ || m.getReturnType() == Calendar.class) {
+ return m.getReturnType();
+ }
+ }
+ return null;
+ }
+}
Propchange: incubator/cxf/trunk/tools/javato/core/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/core/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGenerator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java Thu Jul 26 10:57:46 2007
@@ -1,42 +1,42 @@
-/**
- * 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.fortest.cxf774;
-
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-@WebService(name = "ListTest", targetNamespace = "http://cxf.apache/")
-public interface ListTest {
-
- @WebMethod(operationName = "sayHi", exclude = false)
- @ResponseWrapper(className = "apache.cxf.SayHiResponse",
- localName = "sayHiResponse",
- targetNamespace = "http://cxf.apache/")
- @RequestWrapper(className = "apache.cxf.SayHi",
- localName = "sayHi",
- targetNamespace = "http://cxf.apache/")
- List sayHi(String hi);
-
-}
+/**
+ * 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.fortest.cxf774;
+
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+@WebService(name = "ListTest", targetNamespace = "http://cxf.apache/")
+public interface ListTest {
+
+ @WebMethod(operationName = "sayHi", exclude = false)
+ @ResponseWrapper(className = "apache.cxf.SayHiResponse",
+ localName = "sayHiResponse",
+ targetNamespace = "http://cxf.apache/")
+ @RequestWrapper(className = "apache.cxf.SayHi",
+ localName = "sayHi",
+ targetNamespace = "http://cxf.apache/")
+ List sayHi(String hi);
+
+}
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java Thu Jul 26 10:57:46 2007
@@ -1,31 +1,31 @@
-/**
- * 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.fortest.cxf774;
-import java.util.List;
-import javax.jws.WebService;
-@WebService(serviceName = "SOAPService",
- portName = "SoapPort",
- endpointInterface = "org.apache.cxf.tools.fortest.cxf774.ListTest",
- targetNamespace = "http://cxf.apache/")
-public class ListTestImpl implements ListTest {
- public List sayHi(String hi) {
- return null;
- }
-
-}
+/**
+ * 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.fortest.cxf774;
+import java.util.List;
+import javax.jws.WebService;
+@WebService(serviceName = "SOAPService",
+ portName = "SoapPort",
+ endpointInterface = "org.apache.cxf.tools.fortest.cxf774.ListTest",
+ targetNamespace = "http://cxf.apache/")
+public class ListTestImpl implements ListTest {
+ public List sayHi(String hi) {
+ return null;
+ }
+
+}
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/cxf774/ListTestImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoCalendar.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoCalendar.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoCalendar.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoCalendar.java Thu Jul 26 10:57:46 2007
@@ -1,30 +1,30 @@
-/**
- * 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.fortest.date;
-
-import java.util.Calendar;
-import javax.jws.WebService;
-
-@WebService
-public class EchoCalendar {
- public Calendar echoCalendar(Calendar c) {
- return Calendar.getInstance();
- }
-}
+/**
+ * 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.fortest.date;
+
+import java.util.Calendar;
+import javax.jws.WebService;
+
+@WebService
+public class EchoCalendar {
+ public Calendar echoCalendar(Calendar c) {
+ return Calendar.getInstance();
+ }
+}
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoCalendar.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoCalendar.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoDate.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoDate.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoDate.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoDate.java Thu Jul 26 10:57:46 2007
@@ -1,31 +1,31 @@
-/**
- * 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.fortest.date;
-
-import java.util.Date;
-import javax.jws.WebService;
-
-@WebService
-public class EchoDate {
- public Date echoDate(Date d) {
- return new Date();
- }
-}
-
+/**
+ * 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.fortest.date;
+
+import java.util.Date;
+import javax.jws.WebService;
+
+@WebService
+public class EchoDate {
+ public Date echoDate(Date d) {
+ return new Date();
+ }
+}
+
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoDate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/date/EchoDate.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java Thu Jul 26 10:57:46 2007
@@ -1,112 +1,112 @@
-/**
- * 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.java2wsdl.generator.wsdl11;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.ProcessorTestBase;
-import org.apache.cxf.tools.common.ToolConstants;
-import org.apache.cxf.tools.fortest.date.EchoCalendar;
-import org.apache.cxf.tools.fortest.date.EchoDate;
-import org.apache.cxf.tools.java2wsdl.processor.JavaToProcessor;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class DateTypeCustomGeneratorTest extends ProcessorTestBase {
- DateTypeCustomGenerator gen = new DateTypeCustomGenerator();
- JavaToProcessor processor = new JavaToProcessor();
-
- @Before
- public void setUp() throws Exception {
- super.setUp();
- processor.setEnvironment(env);
- }
-
- @After
- public void tearDown() {
- //super.tearDown();
- }
-
- @Test
- public void testGetJAXBCustFile() {
- gen.setWSDLName("demo");
- assertTrue(gen.getJAXBCustFile(new File(".")).toString().endsWith("demo.xjb"));
- }
-
- private ServiceInfo getServiceInfo(Class clz) {
- env.put(ToolConstants.CFG_CLASSNAME, clz.getName());
- return processor.getServiceBuilder().createService();
- }
-
- @Test
- public void getGetDateType() {
- assertNull(gen.getDateType());
- gen.setServiceModel(getServiceInfo(org.apache.cxf.tools.fortest.jaxws.rpc.GreeterFault.class));
- assertNull(gen.getDateType());
-
- gen.setServiceModel(getServiceInfo(EchoDate.class));
- assertEquals(Date.class, gen.getDateType());
-
- gen.setServiceModel(getServiceInfo(EchoCalendar.class));
- assertEquals(Calendar.class, gen.getDateType());
- }
-
- @Test
- public void testGenerateEmbedStyle() {
- gen.setWSDLName("date_embed");
- gen.setServiceModel(getServiceInfo(EchoDate.class));
- assertEquals(Date.class, gen.getDateType());
-
- String expectedFile = getClass().getResource("expected/date_embed.xml").getFile();
- assertFileEquals(new File(expectedFile), gen.generate(output));
-
- gen.setWSDLName("calendar_embed");
- gen.setServiceModel(getServiceInfo(EchoCalendar.class));
- assertEquals(Calendar.class, gen.getDateType());
-
- expectedFile = getClass().getResource("expected/calendar_embed.xml").getFile();
- assertFileEquals(new File(expectedFile), gen.generate(output));
- }
-
- @Test
- public void testGenerateExternalStyle() {
- gen.setAllowImports(true);
- gen.addSchemaFiles(Arrays.asList(new String[]{"hello_schema1.xsd", "hello_schema2.xsd"}));
-
- gen.setWSDLName("date_external");
- gen.setServiceModel(getServiceInfo(EchoDate.class));
- assertEquals(Date.class, gen.getDateType());
-
- String expectedFile = getClass().getResource("expected/date.xjb").getFile();
- assertFileEquals(new File(expectedFile), gen.generate(output));
-
- gen.setWSDLName("calendar_external");
- gen.setServiceModel(getServiceInfo(EchoCalendar.class));
- assertEquals(Calendar.class, gen.getDateType());
-
- expectedFile = getClass().getResource("expected/calendar.xjb").getFile();
- assertFileEquals(new File(expectedFile), gen.generate(output));
- }
+/**
+ * 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.java2wsdl.generator.wsdl11;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+
+import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.tools.common.ProcessorTestBase;
+import org.apache.cxf.tools.common.ToolConstants;
+import org.apache.cxf.tools.fortest.date.EchoCalendar;
+import org.apache.cxf.tools.fortest.date.EchoDate;
+import org.apache.cxf.tools.java2wsdl.processor.JavaToProcessor;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class DateTypeCustomGeneratorTest extends ProcessorTestBase {
+ DateTypeCustomGenerator gen = new DateTypeCustomGenerator();
+ JavaToProcessor processor = new JavaToProcessor();
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ processor.setEnvironment(env);
+ }
+
+ @After
+ public void tearDown() {
+ //super.tearDown();
+ }
+
+ @Test
+ public void testGetJAXBCustFile() {
+ gen.setWSDLName("demo");
+ assertTrue(gen.getJAXBCustFile(new File(".")).toString().endsWith("demo.xjb"));
+ }
+
+ private ServiceInfo getServiceInfo(Class clz) {
+ env.put(ToolConstants.CFG_CLASSNAME, clz.getName());
+ return processor.getServiceBuilder().createService();
+ }
+
+ @Test
+ public void getGetDateType() {
+ assertNull(gen.getDateType());
+ gen.setServiceModel(getServiceInfo(org.apache.cxf.tools.fortest.jaxws.rpc.GreeterFault.class));
+ assertNull(gen.getDateType());
+
+ gen.setServiceModel(getServiceInfo(EchoDate.class));
+ assertEquals(Date.class, gen.getDateType());
+
+ gen.setServiceModel(getServiceInfo(EchoCalendar.class));
+ assertEquals(Calendar.class, gen.getDateType());
+ }
+
+ @Test
+ public void testGenerateEmbedStyle() {
+ gen.setWSDLName("date_embed");
+ gen.setServiceModel(getServiceInfo(EchoDate.class));
+ assertEquals(Date.class, gen.getDateType());
+
+ String expectedFile = getClass().getResource("expected/date_embed.xml").getFile();
+ assertFileEquals(new File(expectedFile), gen.generate(output));
+
+ gen.setWSDLName("calendar_embed");
+ gen.setServiceModel(getServiceInfo(EchoCalendar.class));
+ assertEquals(Calendar.class, gen.getDateType());
+
+ expectedFile = getClass().getResource("expected/calendar_embed.xml").getFile();
+ assertFileEquals(new File(expectedFile), gen.generate(output));
+ }
+
+ @Test
+ public void testGenerateExternalStyle() {
+ gen.setAllowImports(true);
+ gen.addSchemaFiles(Arrays.asList(new String[]{"hello_schema1.xsd", "hello_schema2.xsd"}));
+
+ gen.setWSDLName("date_external");
+ gen.setServiceModel(getServiceInfo(EchoDate.class));
+ assertEquals(Date.class, gen.getDateType());
+
+ String expectedFile = getClass().getResource("expected/date.xjb").getFile();
+ assertFileEquals(new File(expectedFile), gen.generate(output));
+
+ gen.setWSDLName("calendar_external");
+ gen.setServiceModel(getServiceInfo(EchoCalendar.class));
+ assertEquals(Calendar.class, gen.getDateType());
+
+ expectedFile = getClass().getResource("expected/calendar.xjb").getFile();
+ assertFileEquals(new File(expectedFile), gen.generate(output));
+ }
}
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/DateTypeCustomGeneratorTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar.xjb
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar.xjb?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar.xjb (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar.xjb Thu Jul 26 10:57:46 2007
@@ -1,32 +1,32 @@
-<!--
- 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.
--->
-<jxb:bindings version="1.0"
- xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <jxb:bindings schemaLocation="hello_schema1.xsd" node="/xs:schema">
- <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <jxb:javaType name="java.util.Calendar" xmlType="xs:dateTime" parseMethod="javax.xml.bind.DatatypeConverter.parseDateTime" printMethod="javax.xml.bind.DatatypeConverter.printDateTime"/>
- </jxb:globalBindings>
- </jxb:bindings>
- <jxb:bindings schemaLocation="hello_schema2.xsd" node="/xs:schema">
- <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <jxb:javaType name="java.util.Calendar" xmlType="xs:dateTime" parseMethod="javax.xml.bind.DatatypeConverter.parseDateTime" printMethod="javax.xml.bind.DatatypeConverter.printDateTime"/>
- </jxb:globalBindings>
- </jxb:bindings>
+<!--
+ 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.
+-->
+<jxb:bindings version="1.0"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:bindings schemaLocation="hello_schema1.xsd" node="/xs:schema">
+ <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:javaType name="java.util.Calendar" xmlType="xs:dateTime" parseMethod="javax.xml.bind.DatatypeConverter.parseDateTime" printMethod="javax.xml.bind.DatatypeConverter.printDateTime"/>
+ </jxb:globalBindings>
+ </jxb:bindings>
+ <jxb:bindings schemaLocation="hello_schema2.xsd" node="/xs:schema">
+ <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:javaType name="java.util.Calendar" xmlType="xs:dateTime" parseMethod="javax.xml.bind.DatatypeConverter.parseDateTime" printMethod="javax.xml.bind.DatatypeConverter.printDateTime"/>
+ </jxb:globalBindings>
+ </jxb:bindings>
</jxb:bindings>
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar.xjb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar.xjb
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar.xjb
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar_embed.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar_embed.xml?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar_embed.xml (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar_embed.xml Thu Jul 26 10:57:46 2007
@@ -1,31 +1,31 @@
-<!--
- 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.
--->
-<jaxws:bindings wsdlLocation="calendar_embed.wsdl"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://date.fortest.tools.cxf.apache.org/']">
- <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <jxb:javaType name="java.util.Calendar" xmlType="xs:dateTime"
- parseMethod="javax.xml.bind.DatatypeConverter.parseDateTime"
- printMethod="javax.xml.bind.DatatypeConverter.printDateTime"/>
- </jxb:globalBindings>
- </jaxws:bindings>
+<!--
+ 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.
+-->
+<jaxws:bindings wsdlLocation="calendar_embed.wsdl"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://date.fortest.tools.cxf.apache.org/']">
+ <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:javaType name="java.util.Calendar" xmlType="xs:dateTime"
+ parseMethod="javax.xml.bind.DatatypeConverter.parseDateTime"
+ printMethod="javax.xml.bind.DatatypeConverter.printDateTime"/>
+ </jxb:globalBindings>
+ </jaxws:bindings>
</jaxws:bindings>
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar_embed.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar_embed.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/calendar_embed.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb Thu Jul 26 10:57:46 2007
@@ -1,32 +1,32 @@
-<!--
- 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.
--->
-<jxb:bindings version="1.0"
- xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <jxb:bindings schemaLocation="hello_schema1.xsd" node="/xs:schema">
- <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <jxb:javaType name="java.util.Date" xmlType="xs:dateTime" parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime" printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
- </jxb:globalBindings>
- </jxb:bindings>
- <jxb:bindings schemaLocation="hello_schema2.xsd" node="/xs:schema">
- <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <jxb:javaType name="java.util.Date" xmlType="xs:dateTime" parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime" printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
- </jxb:globalBindings>
- </jxb:bindings>
+<!--
+ 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.
+-->
+<jxb:bindings version="1.0"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:bindings schemaLocation="hello_schema1.xsd" node="/xs:schema">
+ <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:javaType name="java.util.Date" xmlType="xs:dateTime" parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime" printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+ </jxb:globalBindings>
+ </jxb:bindings>
+ <jxb:bindings schemaLocation="hello_schema2.xsd" node="/xs:schema">
+ <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:javaType name="java.util.Date" xmlType="xs:dateTime" parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime" printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+ </jxb:globalBindings>
+ </jxb:bindings>
</jxb:bindings>
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date.xjb
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml Thu Jul 26 10:57:46 2007
@@ -1,31 +1,31 @@
-<!--
- 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.
--->
-<jaxws:bindings wsdlLocation="date_embed.wsdl"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://date.fortest.tools.cxf.apache.org/']">
- <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
- parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
- printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
- </jxb:globalBindings>
- </jaxws:bindings>
+<!--
+ 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.
+-->
+<jaxws:bindings wsdlLocation="date_embed.wsdl"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://date.fortest.tools.cxf.apache.org/']">
+ <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
+ parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
+ printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+ </jxb:globalBindings>
+ </jaxws:bindings>
</jaxws:bindings>
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/expected/date_embed.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/Hello.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/Hello.java?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/Hello.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/Hello.java Thu Jul 26 10:57:46 2007
@@ -1,27 +1,27 @@
-/**
- * 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.java2wsdl.processor;
-
-import javax.jws.WebService;
-
-@WebService
-public interface Hello extends java.rmi.Remote {
- String hello();
+/**
+ * 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.java2wsdl.processor;
+
+import javax.jws.WebService;
+
+@WebService
+public interface Hello extends java.rmi.Remote {
+ String hello();
}
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/Hello.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/Hello.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_calendar.xjb
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_calendar.xjb?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_calendar.xjb (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_calendar.xjb Thu Jul 26 10:57:46 2007
@@ -1,32 +1,32 @@
-<!--
- 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.
--->
-
-<jaxws:bindings wsdlLocation="echo_calendar.wsdl"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://date.fortest.tools.cxf.apache.org/']">
- <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <jxb:javaType name="java.util.Calendar" xmlType="xs:dateTime"
- parseMethod="javax.xml.bind.DatatypeConverter.parseDateTime"
- printMethod="javax.xml.bind.DatatypeConverter.printDateTime"/>
- </jxb:globalBindings>
- </jaxws:bindings>
+<!--
+ 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.
+-->
+
+<jaxws:bindings wsdlLocation="echo_calendar.wsdl"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://date.fortest.tools.cxf.apache.org/']">
+ <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:javaType name="java.util.Calendar" xmlType="xs:dateTime"
+ parseMethod="javax.xml.bind.DatatypeConverter.parseDateTime"
+ printMethod="javax.xml.bind.DatatypeConverter.printDateTime"/>
+ </jxb:globalBindings>
+ </jaxws:bindings>
</jaxws:bindings>
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_calendar.xjb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_calendar.xjb
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_calendar.xjb
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb Thu Jul 26 10:57:46 2007
@@ -1,31 +1,31 @@
-<!--
- 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.
--->
-<jaxws:bindings wsdlLocation="echo_date.wsdl"
- xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://date.fortest.tools.cxf.apache.org/']">
- <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
- parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
- printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
- </jxb:globalBindings>
- </jaxws:bindings>
+<!--
+ 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.
+-->
+<jaxws:bindings wsdlLocation="echo_date.wsdl"
+ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema[@targetNamespace='http://date.fortest.tools.cxf.apache.org/']">
+ <jxb:globalBindings xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <jxb:javaType name="java.util.Date" xmlType="xs:dateTime"
+ parseMethod="org.apache.cxf.tools.common.DataTypeAdapter.parseDateTime"
+ printMethod="org.apache.cxf.tools.common.DataTypeAdapter.printDateTime"/>
+ </jxb:globalBindings>
+ </jaxws:bindings>
</jaxws:bindings>
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/echo_date.xjb
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl Thu Jul 26 10:57:46 2007
@@ -1,148 +1,148 @@
-<?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="GreeterService" targetNamespace="http://apache.org/fault" xmlns:ns1="http://apache.org/fault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/fault/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/fault/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/fault/types">
-<xs:element name="BadRecordLit" nillable="true" type="xs:string"/>
-<xs:element name="NoSuchCodeLit">
-<xs:complexType>
-<xs:sequence>
-<xs:element form="qualified" name="code" type="tns:ErrorCode"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-<xs:element name="greetMe">
-<xs:complexType>
-<xs:sequence>
-<xs:element form="qualified" name="requestType" type="xs:string"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-<xs:element name="greetMeResponse">
-<xs:complexType>
-<xs:sequence>
-<xs:element form="qualified" name="responseType" type="xs:string"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-<xs:element name="testDocLitFault">
-<xs:complexType>
-<xs:sequence>
-<xs:element form="qualified" name="faultType" type="xs:string"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-<xs:element name="testDocLitFaultResponse">
-<xs:complexType/>
-</xs:element>
-<xs:complexType name="ErrorCode">
-<xs:sequence>
-<xs:element form="qualified" name="minor" type="xs:short"/>
-<xs:element form="qualified" name="major" type="xs:short"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="BadRecord">
-<xs:sequence>
-<xs:element form="qualified" name="reason" type="xs:string"/>
-<xs:element form="qualified" name="code" type="xs:short"/>
-</xs:sequence>
-</xs:complexType>
-</xs:schema>
- </wsdl:types>
- <wsdl:message name="BadRecordLitFault">
- <wsdl:part name="fault" element="ns2:BadRecordLit">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="testDocLitFault">
- <wsdl:part name="parameters" element="ns2:testDocLitFault">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part name="result" element="ns2:greetMeResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="testDocLitFaultResponse">
- <wsdl:part name="result" element="ns2:testDocLitFaultResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="NoSuchCodeLitFault">
- <wsdl:part name="fault" element="ns2:NoSuchCodeLit">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="greetMe">
- <wsdl:part name="parameters" element="ns2:greetMe">
- </wsdl:part>
- </wsdl:message>
- <wsdl:portType name="Greeter">
- <wsdl:operation name="greetMe">
- <wsdl:input name="greetMe" message="ns1:greetMe">
- </wsdl:input>
- <wsdl:output name="greetMeResponse" message="ns1:greetMeResponse">
- </wsdl:output>
- <wsdl:fault name="NoSuchCodeLitFault" message="ns1:NoSuchCodeLitFault">
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="testDocLitFault">
- <wsdl:input name="testDocLitFault" message="ns1:testDocLitFault">
- </wsdl:input>
- <wsdl:output name="testDocLitFaultResponse" message="ns1:testDocLitFaultResponse">
- </wsdl:output>
- <wsdl:fault name="NoSuchCodeLitFault" message="ns1:NoSuchCodeLitFault">
- </wsdl:fault>
- <wsdl:fault name="BadRecordLitFault" message="ns1:BadRecordLitFault">
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="greetMe">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="greetMeResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="NoSuchCodeLitFault">
- <soap:fault name="NoSuchCodeLitFault" use="literal"/>
- </wsdl:fault>
- </wsdl:operation>
- <wsdl:operation name="testDocLitFault">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="testDocLitFault">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="testDocLitFaultResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="NoSuchCodeLitFault">
- <soap:fault name="NoSuchCodeLitFault" use="literal"/>
- </wsdl:fault>
- <wsdl:fault name="BadRecordLitFault">
- <soap:fault name="BadRecordLitFault" use="literal"/>
- </wsdl:fault>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="GreeterService">
- <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
- <soap:address location="http://localhost:9090/hello"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
+<?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="GreeterService" targetNamespace="http://apache.org/fault" xmlns:ns1="http://apache.org/fault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://apache.org/fault/types" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:types>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/fault/types" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://apache.org/fault/types">
+<xs:element name="BadRecordLit" nillable="true" type="xs:string"/>
+<xs:element name="NoSuchCodeLit">
+<xs:complexType>
+<xs:sequence>
+<xs:element form="qualified" name="code" type="tns:ErrorCode"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+<xs:element name="greetMe">
+<xs:complexType>
+<xs:sequence>
+<xs:element form="qualified" name="requestType" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+<xs:element name="greetMeResponse">
+<xs:complexType>
+<xs:sequence>
+<xs:element form="qualified" name="responseType" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+<xs:element name="testDocLitFault">
+<xs:complexType>
+<xs:sequence>
+<xs:element form="qualified" name="faultType" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+<xs:element name="testDocLitFaultResponse">
+<xs:complexType/>
+</xs:element>
+<xs:complexType name="ErrorCode">
+<xs:sequence>
+<xs:element form="qualified" name="minor" type="xs:short"/>
+<xs:element form="qualified" name="major" type="xs:short"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="BadRecord">
+<xs:sequence>
+<xs:element form="qualified" name="reason" type="xs:string"/>
+<xs:element form="qualified" name="code" type="xs:short"/>
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
+ </wsdl:types>
+ <wsdl:message name="BadRecordLitFault">
+ <wsdl:part name="fault" element="ns2:BadRecordLit">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="testDocLitFault">
+ <wsdl:part name="parameters" element="ns2:testDocLitFault">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part name="result" element="ns2:greetMeResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="testDocLitFaultResponse">
+ <wsdl:part name="result" element="ns2:testDocLitFaultResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="NoSuchCodeLitFault">
+ <wsdl:part name="fault" element="ns2:NoSuchCodeLit">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="greetMe">
+ <wsdl:part name="parameters" element="ns2:greetMe">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="Greeter">
+ <wsdl:operation name="greetMe">
+ <wsdl:input name="greetMe" message="ns1:greetMe">
+ </wsdl:input>
+ <wsdl:output name="greetMeResponse" message="ns1:greetMeResponse">
+ </wsdl:output>
+ <wsdl:fault name="NoSuchCodeLitFault" message="ns1:NoSuchCodeLitFault">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="testDocLitFault">
+ <wsdl:input name="testDocLitFault" message="ns1:testDocLitFault">
+ </wsdl:input>
+ <wsdl:output name="testDocLitFaultResponse" message="ns1:testDocLitFaultResponse">
+ </wsdl:output>
+ <wsdl:fault name="NoSuchCodeLitFault" message="ns1:NoSuchCodeLitFault">
+ </wsdl:fault>
+ <wsdl:fault name="BadRecordLitFault" message="ns1:BadRecordLitFault">
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="GreeterServiceSoapBinding" type="ns1:Greeter">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="greetMe">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMe">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="greetMeResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="NoSuchCodeLitFault">
+ <soap:fault name="NoSuchCodeLitFault" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="testDocLitFault">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="testDocLitFault">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="testDocLitFaultResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="NoSuchCodeLitFault">
+ <soap:fault name="NoSuchCodeLitFault" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="BadRecordLitFault">
+ <soap:fault name="BadRecordLitFault" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="GreeterService">
+ <wsdl:port name="GreeterPort" binding="ns1:GreeterServiceSoapBinding">
+ <soap:address location="http://localhost:9090/hello"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl?view=diff&rev=559909&r1=559908&r2=559909
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl Thu Jul 26 10:57:46 2007
@@ -1,70 +1,70 @@
-<?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="SOAPService" targetNamespace="http://cxf.apache/" xmlns:ns1="http://cxf.apache/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache/">
-<xsd:element name="sayHi" type="sayHi"/>
-<xsd:complexType name="sayHi">
-<xsd:sequence>
-<xsd:element minOccurs="0" name="arg0" type="xsd:string"/>
-</xsd:sequence>
-</xsd:complexType>
-<xsd:element name="sayHiResponse" type="sayHiResponse"/>
-<xsd:complexType name="sayHiResponse">
-<xsd:sequence>
-<xsd:element maxOccurs="unbounded" minOccurs="0" name="return" type="xsd:anyType"/>
-</xsd:sequence>
-</xsd:complexType>
-</xsd:schema>
- </wsdl:types>
- <wsdl:message name="sayHiResponse">
- <wsdl:part name="result" element="ns1:sayHiResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="sayHi">
- <wsdl:part name="parameters" element="ns1:sayHi">
- </wsdl:part>
- </wsdl:message>
- <wsdl:portType name="ListTest">
- <wsdl:operation name="sayHi">
- <wsdl:input name="sayHi" message="ns1:sayHi">
- </wsdl:input>
- <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
- </wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="SOAPServiceSoapBinding" type="ns1:ListTest">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="sayHi">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="sayHi">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="SOAPService">
- <wsdl:port name="SoapPort" binding="ns1:SOAPServiceSoapBinding">
- <soap:address location="http://localhost:9090/hello"/>
- </wsdl:port>
- </wsdl:service>
+<?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="SOAPService" targetNamespace="http://cxf.apache/" xmlns:ns1="http://cxf.apache/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:types>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.apache/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.apache/">
+<xsd:element name="sayHi" type="sayHi"/>
+<xsd:complexType name="sayHi">
+<xsd:sequence>
+<xsd:element minOccurs="0" name="arg0" type="xsd:string"/>
+</xsd:sequence>
+</xsd:complexType>
+<xsd:element name="sayHiResponse" type="sayHiResponse"/>
+<xsd:complexType name="sayHiResponse">
+<xsd:sequence>
+<xsd:element maxOccurs="unbounded" minOccurs="0" name="return" type="xsd:anyType"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="sayHiResponse">
+ <wsdl:part name="result" element="ns1:sayHiResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="sayHi">
+ <wsdl:part name="parameters" element="ns1:sayHi">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="ListTest">
+ <wsdl:operation name="sayHi">
+ <wsdl:input name="sayHi" message="ns1:sayHi">
+ </wsdl:input>
+ <wsdl:output name="sayHiResponse" message="ns1:sayHiResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="SOAPServiceSoapBinding" type="ns1:ListTest">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="sayHi">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="sayHi">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="sayHiResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SOAPService">
+ <wsdl:port name="SoapPort" binding="ns1:SOAPServiceSoapBinding">
+ <soap:address location="http://localhost:9090/hello"/>
+ </wsdl:port>
+ </wsdl:service>
</wsdl:definitions>
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml