JBossWS SVN: r18586 - stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-24 10:25:40 -0400 (Thu, 24 Apr 2014)
New Revision: 18586
Removed:
stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/tools-plugin.xml
stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/tools.service.validator.xml
stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/wsdl.plugin.xml
Log:
Removing old and not required tools descriptor (the proper versions are consumed from the cxf jars)
Deleted: stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/tools-plugin.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/tools-plugin.xml 2014-04-24 13:59:17 UTC (rev 18585)
+++ stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/tools-plugin.xml 2014-04-24 14:25:40 UTC (rev 18586)
@@ -1,56 +0,0 @@
-<?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.
--->
-<plugin xmlns="http://cxf.apache.org/tools/plugin" name="default" version="" provider="cxf.apache.org">
- <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
- <container name="JAXWSContainer" toolspec="jaxws-toolspec.xml" />
- <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor" />
- <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11" />
- <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators">
- <generator name="AntGenerator" />
- <generator name="ClientGenerator" />
- <generator name="FaultGenerator" />
- <generator name="ImplGenerator" />
- <generator name="SEIGenerator" />
- <generator name="ServerGenerator" />
- <generator name="ServiceGenerator" />
- </generators>
- </frontend>
- <frontend name="jaxws21" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
- <container name="JAXWS21Container" toolspec="jaxws-toolspec.xml" />
- <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor" />
- <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11" />
- <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators">
- <generator name="AntGenerator" />
- <generator name="ClientGenerator" />
- <generator name="FaultGenerator" />
- <generator name="ImplGenerator" />
- <generator name="SEIGenerator" />
- <generator name="ServerGenerator" />
- <generator name="JAXWS21ServiceGenerator" />
- </generators>
- </frontend>
- <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding" />
- <databinding name="xmlbeans" package="org.apache.cxf.xmlbeans.tools" profile="XMLBeansToolingDataBinding" />
- <databinding name="jibx" package="org.apache.cxf.jibx.tools" profile="JibxToolingDataBinding" />
- <databinding name="sdo" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
- <databinding name="sdo-dynamic" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
- <databinding name="sdo-static" package="org.apache.cxf.sdo.tools" profile="SDODatabinding" />
-</plugin>
-
Deleted: stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/tools.service.validator.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/tools.service.validator.xml 2014-04-24 13:59:17 UTC (rev 18585)
+++ stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/tools.service.validator.xml 2014-04-24 14:25:40 UTC (rev 18586)
@@ -1,27 +0,0 @@
-<?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.
--->
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-
-<properties>
- <entry key="UniqueBodyValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator</entry>
- <entry key="WrapperStyleNameCollisionValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.WrapperStyleNameCollisionValidator</entry>
- <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry>
-</properties>
-
Deleted: stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/wsdl.plugin.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2014-04-24 13:59:17 UTC (rev 18585)
+++ stack/cxf/branches/asoldano/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2014-04-24 14:25:40 UTC (rev 18586)
@@ -1,30 +0,0 @@
-<?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.
--->
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-
-<properties>
- <entry key="soap-javax.wsdl.Port">org.apache.cxf.binding.soap.wsdl11.SoapAddressPlugin</entry>
- <entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry>
- <entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry>
- <entry key="xml-javax.wsdl.BindingInput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry>
- <entry key="xml-javax.wsdl.BindingOutput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry>
- <entry key="jms-javax.wsdl.Port">org.apache.cxf.transport.jms.wsdl11.JmsTransportPlugin</entry>
-</properties>
-
10 years, 8 months
JBossWS SVN: r18585 - stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-24 09:59:17 -0400 (Thu, 24 Apr 2014)
New Revision: 18585
Modified:
stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
Log:
Restoring proper wsdl soap:address rewrite
Modified: stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
--- stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-04-23 15:14:21 UTC (rev 18584)
+++ stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2014-04-24 13:59:17 UTC (rev 18585)
@@ -27,6 +27,7 @@
import java.io.Writer;
import java.net.MalformedURLException;
import java.net.URL;
+import java.security.AccessController;
import java.util.Collection;
import java.util.regex.Pattern;
@@ -39,16 +40,21 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
+import org.apache.cxf.frontend.WSDLGetUtils;
+import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
import org.apache.cxf.transport.http.DestinationRegistry;
import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.jboss.util.NotImplementedException;
+import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointMetrics;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.stack.cxf.addressRewrite.SoapAddressRewriteHelper;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
/**
@@ -75,18 +81,17 @@
public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException
{
- if ("GET".equals(req.getMethod()))
+ final boolean isGet = "GET".equals(req.getMethod());
+ final boolean isGetWithQueryString = isGet && hasQueryString(req);
+ if (isGet && !isGetWithQueryString)
{
- final String queryString = req.getQueryString();
- if ((null == queryString) || (queryString.length() == 0)) {
- //reject HTTP GET without query string (only support messages sent w/ POST)
- res.setStatus(405);
- res.setContentType("text/plain");
- Writer out = res.getWriter();
- out.write("HTTP GET not supported");
- out.close();
- return;
- }
+ //reject HTTP GET without query string (only support messages sent w/ POST)
+ res.setStatus(405);
+ res.setContentType("text/plain");
+ Writer out = res.getWriter();
+ out.write("HTTP GET not supported");
+ out.close();
+ return;
}
Long beginTime = initRequestMetrics(ep);
@@ -96,6 +101,12 @@
try
{
ServletConfig cfg = (ServletConfig)context.getAttribute(ServletConfig.class.getName());
+ if (isGetWithQueryString) {
+ final EndpointInfo endpointInfo = dest.getEndpointInfo();
+ final boolean autoRewrite = SoapAddressRewriteHelper.isAutoRewriteOn(getServerConfig());
+ endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS, autoRewrite);
+ endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL, autoRewrite);
+ }
dest.invoke(cfg, context, req, response);
}
catch (IOException e)
@@ -111,6 +122,12 @@
processFaultMetrics(ep, beginTime);
}
}
+
+ private boolean hasQueryString(HttpServletRequest req)
+ {
+ final String queryString = req.getQueryString();
+ return ((null != queryString) && (queryString.length() > 0));
+ }
public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context)
{
@@ -183,7 +200,16 @@
throw Messages.MESSAGES.cannotObtainDestinationFactoryForHttpTransport(e);
}
return null;
- }
+ }
+
+ private static ServerConfig getServerConfig()
+ {
+ if (System.getSecurityManager() == null)
+ {
+ return AbstractServerConfig.getServerIntegrationServerConfig();
+ }
+ return AccessController.doPrivileged(AbstractServerConfig.GET_SERVER_INTEGRATION_SERVER_CONFIG);
+ }
private long initRequestMetrics(Endpoint endpoint)
{
10 years, 8 months
JBossWS SVN: r18584 - stack/cxf/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-23 11:14:21 -0400 (Wed, 23 Apr 2014)
New Revision: 18584
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
stack/cxf/trunk/modules/dist/src/main/distro/ReleaseNotes.txt
Log:
Updating jbossws home page links to use new address
Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-04-23 15:12:04 UTC (rev 18583)
+++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-04-23 15:14:21 UTC (rev 18584)
@@ -1,6 +1,6 @@
${project.name}
-http://www.jboss.org/jbossws/
+http://jbossws.jboss.org
Version: jbossws-cxf-${project.version}
Modified: stack/cxf/trunk/modules/dist/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/ReleaseNotes.txt 2014-04-23 15:12:04 UTC (rev 18583)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ReleaseNotes.txt 2014-04-23 15:14:21 UTC (rev 18584)
@@ -1,13 +1,13 @@
${project.name}
-http://www.jboss.org/jbossws/
+http://jbossws.jboss.org
Version: jbossws-cxf-${project.version}
Release Notes
=============
-The project home page (http://www.jboss.org/jbossws) and the official documentation
+The project home page (http://jbossws.jboss.org) and the official documentation
(https://docs.jboss.org/author/display/JBWS) are usually good starting points.
They contain the User Guide and Quick Start instructions.
@@ -15,7 +15,7 @@
that ship with the distribution.
If you have any questions, please post to the JBossWS User Forum
-http://www.jboss.org/index.html?module=bb&op=viewforum&f=276
+https://community.jboss.org/en/jbossws
For details see the change log.
https://issues.jboss.org/browse/JBWS?report=com.atlassian.jira.plugin.sys...
10 years, 8 months
JBossWS SVN: r18583 - stack/cxf/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-23 11:12:04 -0400 (Wed, 23 Apr 2014)
New Revision: 18583
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
Log:
Updating userforum link
Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-04-23 04:03:08 UTC (rev 18582)
+++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-04-23 15:12:04 UTC (rev 18583)
@@ -33,7 +33,7 @@
You should see no errors.
If you have any questions, please post to the userforum:
-http://www.jboss.org/index.html?module=bb&op=viewforum&f=276
+https://community.jboss.org/en/jbossws
Enjoy,
The JBossWS Team
10 years, 8 months
JBossWS SVN: r18582 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-04-23 00:03:08 -0400 (Wed, 23 Apr 2014)
New Revision: 18582
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Enable MixtedTypeTestCase
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-04-22 15:34:00 UTC (rev 18581)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-04-23 04:03:08 UTC (rev 18582)
@@ -889,9 +889,6 @@
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
-
- <!--[WFLY-3187] Uncomment this after it is merged-->
- <exclude>org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase*</exclude>
</excludes>
</configuration>
</plugin>
10 years, 8 months
JBossWS SVN: r18581 - in stack/cxf/trunk/modules/testsuite/shared-tests/src/test: java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-22 11:34:00 -0400 (Tue, 22 Apr 2014)
New Revision: 18581
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/Adapter1.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarEndpoint.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarEndpointImpl.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoCalendar.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoCalendarResponse.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoXMLGregorianCalendar.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoXMLGregorianCalendarResponse.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/ObjectFactory.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/package-info.java
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
Log:
Adding a testcase on jaxb databinding (in particular on Calendar / XMLCalendar) and XmlAdapter
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-04-22 09:40:40 UTC (rev 18580)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-04-22 15:34:00 UTC (rev 18581)
@@ -32,28 +32,28 @@
<target name="build-jars-jaxws" description="Build the deployments.">
- <!-- endpoint-publish.war -->
- <war warfile="${tests.output.dir}/test-libs/endpoint-publish.war" needxmlfile='false'>
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/publish/**/*.class"/>
- <include name="org/jboss/test/ws/publish/EndpointImpl5.xml"/>
- <include name="org/jboss/test/ws/publish/TestService.xml"/>
- <exclude name="org/jboss/test/ws/publish/*TestCase.class"/>
- </classes>
- <classes dir="${tests.output.dir}/test-classes/org/jboss/test/ws/publish">
- <include name="WEB-INF/wsdl/**" />
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/publish/WEB-INF">
- <include name="wsdl/**"/>
- </webinf>
- <zipfileset dir="${tests.output.dir}/test-resources/publish/META-INF" prefix="META-INF">
- <include name="permissions.xml"/>
- </zipfileset>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.common" />
- </manifest>
- </war>
-
+ <!-- endpoint-publish.war -->
+ <war warfile="${tests.output.dir}/test-libs/endpoint-publish.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/publish/**/*.class" />
+ <include name="org/jboss/test/ws/publish/EndpointImpl5.xml" />
+ <include name="org/jboss/test/ws/publish/TestService.xml" />
+ <exclude name="org/jboss/test/ws/publish/*TestCase.class" />
+ </classes>
+ <classes dir="${tests.output.dir}/test-classes/org/jboss/test/ws/publish">
+ <include name="WEB-INF/wsdl/**" />
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/publish/WEB-INF">
+ <include name="wsdl/**" />
+ </webinf>
+ <zipfileset dir="${tests.output.dir}/test-resources/publish/META-INF" prefix="META-INF">
+ <include name="permissions.xml" />
+ </zipfileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.common" />
+ </manifest>
+ </war>
+
<!-- jaxws-anonymous -->
<war warfile="${tests.output.dir}/test-libs/jaxws-anonymous.war" webxml="${tests.output.dir}/test-resources/jaxws/anonymous/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -116,6 +116,17 @@
</classes>
</war>
+ <!-- jaxws-calendar -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-calendar.war" needxmlfile="false">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/calendar/CalendarEndpoint*.class" />
+ <include name="org/jboss/test/ws/jaxws/calendar/Echo*.class" />
+ <include name="org/jboss/test/ws/jaxws/calendar/Adapter*.class" />
+ <include name="org/jboss/test/ws/jaxws/calendar/package-info.class" />
+ <include name="org/jboss/test/ws/jaxws/calendar/ObjectFactory*.class" />
+ </classes>
+ </war>
+
<!-- jaxws-classloading-service -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-classloading-service.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -153,7 +164,7 @@
<include name="META-INF/jaxws-client-config.xml" />
</classes>
<zipfileset dir="${tests.output.dir}/test-resources/jaxws/clientConfig/META-INF" prefix="META-INF">
- <include name="permissions.xml"/>
+ <include name="permissions.xml" />
</zipfileset>
<manifest>
<attribute name="Dependencies" value="org.jboss.ws.common" />
@@ -1218,7 +1229,7 @@
<webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3223/WEB-INF">
<include name="wsdl/**" />
</webinf>
- <manifest>
+ <manifest>
<attribute name="Dependencies" value="org.jboss.ws.common" />
</manifest>
</war>
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/Adapter1.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/Adapter1.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/Adapter1.java 2014-04-22 15:34:00 UTC (rev 18581)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.calendar;
+
+import java.util.Calendar;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+public class Adapter1 extends XmlAdapter<String, Calendar>
+{
+
+ public Calendar unmarshal(String value)
+ {
+ if (value == null || value.trim().length() == 0) {
+ return null;
+ }
+ return (javax.xml.bind.DatatypeConverter.parseDateTime(value));
+ }
+
+ public String marshal(Calendar value)
+ {
+ if (value == null)
+ {
+ return null;
+ }
+ return (javax.xml.bind.DatatypeConverter.printDateTime(value));
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/Adapter1.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarEndpoint.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarEndpoint.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarEndpoint.java 2014-04-22 15:34:00 UTC (rev 18581)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.calendar;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+@WebService(targetNamespace = "http://org.jboss.ws/jaxws/calendar", name = "CalendarEndpoint")
+(a)XmlSeeAlso({ObjectFactory.class})
+public interface CalendarEndpoint {
+
+ @WebResult(name = "return", targetNamespace = "")
+ @RequestWrapper(localName = "echoXMLGregorianCalendar", targetNamespace = "http://org.jboss.ws/jaxws/calendar", className = "org.jboss.test.ws.jaxws.calendar.EchoXMLGregorianCalendar")
+ @WebMethod
+ @ResponseWrapper(localName = "echoXMLGregorianCalendarResponse", targetNamespace = "http://org.jboss.ws/jaxws/calendar", className = "org.jboss.test.ws.jaxws.calendar.EchoXMLGregorianCalendarResponse")
+ public java.lang.Object echoXMLGregorianCalendar(
+ @WebParam(name = "arg0", targetNamespace = "")
+ java.lang.Object arg0
+ );
+
+ @WebResult(name = "return", targetNamespace = "")
+ @RequestWrapper(localName = "echoCalendar", targetNamespace = "http://org.jboss.ws/jaxws/calendar", className = "org.jboss.test.ws.jaxws.calendar.EchoCalendar")
+ @WebMethod
+ @ResponseWrapper(localName = "echoCalendarResponse", targetNamespace = "http://org.jboss.ws/jaxws/calendar", className = "org.jboss.test.ws.jaxws.calendar.EchoCalendarResponse")
+ public java.util.Calendar echoCalendar(
+ @WebParam(name = "arg0", targetNamespace = "")
+ java.util.Calendar arg0
+ );
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarEndpoint.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarEndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarEndpointImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarEndpointImpl.java 2014-04-22 15:34:00 UTC (rev 18581)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.calendar;
+
+import java.util.Calendar;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+@WebService(targetNamespace = "http://org.jboss.ws/jaxws/calendar",
+ name = "CalendarEndpoint",
+ portName = "EndpointPort",
+ serviceName = "EndpointService",
+ endpointInterface = "org.jboss.test.ws.jaxws.calendar.CalendarEndpoint")
+public class CalendarEndpointImpl implements CalendarEndpoint
+{
+
+ @Override
+ @WebResult(name = "return", targetNamespace = "")
+ @RequestWrapper(localName = "echoXMLGregorianCalendar", targetNamespace = "http://org.jboss.ws/jaxws/calendar", className = "org.jboss.test.ws.jaxws.calendar.EchoXMLGregorianCalendar")
+ @WebMethod
+ @ResponseWrapper(localName = "echoXMLGregorianCalendarResponse", targetNamespace = "http://org.jboss.ws/jaxws/calendar", className = "org.jboss.test.ws.jaxws.calendar.EchoXMLGregorianCalendarResponse")
+ public Object echoXMLGregorianCalendar(@WebParam(name = "arg0", targetNamespace = "") Object arg0)
+ {
+ return arg0;
+ }
+
+ @Override
+ @WebResult(name = "return", targetNamespace = "")
+ @RequestWrapper(localName = "echoCalendar", targetNamespace = "http://org.jboss.ws/jaxws/calendar", className = "org.jboss.test.ws.jaxws.calendar.EchoCalendar")
+ @WebMethod
+ @ResponseWrapper(localName = "echoCalendarResponse", targetNamespace = "http://org.jboss.ws/jaxws/calendar", className = "org.jboss.test.ws.jaxws.calendar.EchoCalendarResponse")
+ public Calendar echoCalendar(@WebParam(name = "arg0", targetNamespace = "") Calendar arg0)
+ {
+ return arg0;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarEndpointImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java 2014-04-22 15:34:00 UTC (rev 18581)
@@ -0,0 +1,99 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.calendar;
+
+import java.io.ByteArrayInputStream;
+import java.net.URL;
+import java.util.Calendar;
+
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
+import javax.xml.ws.Service.Mode;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test calendar type binding
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 22-Apr-2014
+ */
+public class CalendarTestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-calendar/EndpointService";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(CalendarTestCase.class, "jaxws-calendar.war");
+ }
+
+ public void testCalendar() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName qname = new QName("http://org.jboss.ws/jaxws/calendar", "EndpointService");
+ Service service = Service.create(wsdlURL, qname);
+ CalendarEndpoint port = service.getPort(CalendarEndpoint.class);
+
+ Calendar calendar = Calendar.getInstance();
+
+ Calendar response = port.echoCalendar(calendar);
+ assertEquals(calendar.getTimeInMillis(), response.getTimeInMillis());
+ }
+
+ public void testXMLGregorianCalendar() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName qname = new QName("http://org.jboss.ws/jaxws/calendar", "EndpointService");
+ Service service = Service.create(wsdlURL, qname);
+ CalendarEndpoint port = service.getPort(CalendarEndpoint.class);
+
+ DatatypeFactory calFactory = DatatypeFactory.newInstance();
+ XMLGregorianCalendar calendar = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0);
+
+ Object response = port.echoXMLGregorianCalendar(calendar);
+ assertEquals("2002-04-05T00:00:00.000Z", response.toString());
+ }
+
+ public void testEmptyCalendar() throws Exception {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName qname = new QName("http://org.jboss.ws/jaxws/calendar", "EndpointService");
+ Service service = Service.create(wsdlURL, qname);
+
+ Dispatch<SOAPMessage> dispatch = service.createDispatch(new QName("http://org.jboss.ws/jaxws/calendar", "EndpointPort"), SOAPMessage.class, Mode.MESSAGE);
+
+ String reqEnv = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><soap:Body><ns2:echoCalendar xmlns:ns2=\"http://org.jboss.ws/jaxws/calendar\"><arg0/></ns2:echoCalendar></soap:Body></soap:Envelope>";
+
+ SOAPMessage reqMsg = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
+ SOAPMessage resMsg = dispatch.invoke(reqMsg);
+
+ assertNotNull(resMsg);
+ //TODO improve checks
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/CalendarTestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoCalendar.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoCalendar.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoCalendar.java 2014-04-22 15:34:00 UTC (rev 18581)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.calendar;
+
+import java.util.Calendar;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for echoCalendar complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="echoCalendar">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echoCalendar", propOrder = {
+ "arg0"
+})
+public class EchoCalendar {
+
+ @XmlElement(type = String.class)
+ @XmlJavaTypeAdapter(Adapter1 .class)
+ @XmlSchemaType(name = "dateTime")
+ protected Calendar arg0;
+
+ /**
+ * Gets the value of the arg0 property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public Calendar getArg0() {
+ return arg0;
+ }
+
+ /**
+ * Sets the value of the arg0 property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setArg0(Calendar value) {
+ this.arg0 = value;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoCalendar.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoCalendarResponse.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoCalendarResponse.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoCalendarResponse.java 2014-04-22 15:34:00 UTC (rev 18581)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.calendar;
+
+import java.util.Calendar;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for echoCalendarResponse complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="echoCalendarResponse">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="return" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echoCalendarResponse", propOrder = {
+ "_return"
+})
+public class EchoCalendarResponse {
+
+ @XmlElement(name = "return", type = String.class)
+ @XmlJavaTypeAdapter(Adapter1 .class)
+ @XmlSchemaType(name = "dateTime")
+ protected Calendar _return;
+
+ /**
+ * Gets the value of the return property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public Calendar getReturn() {
+ return _return;
+ }
+
+ /**
+ * Sets the value of the return property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setReturn(Calendar value) {
+ this._return = value;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoCalendarResponse.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoXMLGregorianCalendar.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoXMLGregorianCalendar.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoXMLGregorianCalendar.java 2014-04-22 15:34:00 UTC (rev 18581)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.calendar;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for echoXMLGregorianCalendar complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="echoXMLGregorianCalendar">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echoXMLGregorianCalendar", propOrder = {
+ "arg0"
+})
+public class EchoXMLGregorianCalendar {
+
+ @XmlSchemaType(name = "anySimpleType")
+ protected Object arg0;
+
+ /**
+ * Gets the value of the arg0 property.
+ *
+ * @return
+ * possible object is
+ * {@link Object }
+ *
+ */
+ public Object getArg0() {
+ return arg0;
+ }
+
+ /**
+ * Sets the value of the arg0 property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Object }
+ *
+ */
+ public void setArg0(Object value) {
+ this.arg0 = value;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoXMLGregorianCalendar.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoXMLGregorianCalendarResponse.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoXMLGregorianCalendarResponse.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoXMLGregorianCalendarResponse.java 2014-04-22 15:34:00 UTC (rev 18581)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.calendar;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for echoXMLGregorianCalendarResponse complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="echoXMLGregorianCalendarResponse">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="return" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echoXMLGregorianCalendarResponse", propOrder = {
+ "_return"
+})
+public class EchoXMLGregorianCalendarResponse {
+
+ @XmlElement(name = "return")
+ @XmlSchemaType(name = "anySimpleType")
+ protected Object _return;
+
+ /**
+ * Gets the value of the return property.
+ *
+ * @return
+ * possible object is
+ * {@link Object }
+ *
+ */
+ public Object getReturn() {
+ return _return;
+ }
+
+ /**
+ * Sets the value of the return property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Object }
+ *
+ */
+ public void setReturn(Object value) {
+ this._return = value;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/EchoXMLGregorianCalendarResponse.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/ObjectFactory.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/ObjectFactory.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/ObjectFactory.java 2014-04-22 15:34:00 UTC (rev 18581)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.calendar;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.test.ws.jaxws.calendar package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _EchoXMLGregorianCalendar_QNAME = new QName("http://org.jboss.ws/jaxws/calendar", "echoXMLGregorianCalendar");
+ private final static QName _EchoCalendar_QNAME = new QName("http://org.jboss.ws/jaxws/calendar", "echoCalendar");
+ private final static QName _EchoCalendarResponse_QNAME = new QName("http://org.jboss.ws/jaxws/calendar", "echoCalendarResponse");
+ private final static QName _EchoXMLGregorianCalendarResponse_QNAME = new QName("http://org.jboss.ws/jaxws/calendar", "echoXMLGregorianCalendarResponse");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.calendar
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link EchoXMLGregorianCalendar }
+ *
+ */
+ public EchoXMLGregorianCalendar createEchoXMLGregorianCalendar() {
+ return new EchoXMLGregorianCalendar();
+ }
+
+ /**
+ * Create an instance of {@link EchoCalendarResponse }
+ *
+ */
+ public EchoCalendarResponse createEchoCalendarResponse() {
+ return new EchoCalendarResponse();
+ }
+
+ /**
+ * Create an instance of {@link EchoXMLGregorianCalendarResponse }
+ *
+ */
+ public EchoXMLGregorianCalendarResponse createEchoXMLGregorianCalendarResponse() {
+ return new EchoXMLGregorianCalendarResponse();
+ }
+
+ /**
+ * Create an instance of {@link EchoCalendar }
+ *
+ */
+ public EchoCalendar createEchoCalendar() {
+ return new EchoCalendar();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link EchoXMLGregorianCalendar }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/calendar", name = "echoXMLGregorianCalendar")
+ public JAXBElement<EchoXMLGregorianCalendar> createEchoXMLGregorianCalendar(EchoXMLGregorianCalendar value) {
+ return new JAXBElement<EchoXMLGregorianCalendar>(_EchoXMLGregorianCalendar_QNAME, EchoXMLGregorianCalendar.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link EchoCalendar }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/calendar", name = "echoCalendar")
+ public JAXBElement<EchoCalendar> createEchoCalendar(EchoCalendar value) {
+ return new JAXBElement<EchoCalendar>(_EchoCalendar_QNAME, EchoCalendar.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link EchoCalendarResponse }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/calendar", name = "echoCalendarResponse")
+ public JAXBElement<EchoCalendarResponse> createEchoCalendarResponse(EchoCalendarResponse value) {
+ return new JAXBElement<EchoCalendarResponse>(_EchoCalendarResponse_QNAME, EchoCalendarResponse.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link EchoXMLGregorianCalendarResponse }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/calendar", name = "echoXMLGregorianCalendarResponse")
+ public JAXBElement<EchoXMLGregorianCalendarResponse> createEchoXMLGregorianCalendarResponse(EchoXMLGregorianCalendarResponse value) {
+ return new JAXBElement<EchoXMLGregorianCalendarResponse>(_EchoXMLGregorianCalendarResponse_QNAME, EchoXMLGregorianCalendarResponse.class, null, value);
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/ObjectFactory.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/package-info.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/package-info.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/package-info.java 2014-04-22 15:34:00 UTC (rev 18581)
@@ -0,0 +1,23 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.ws/jaxws/calendar")
+package org.jboss.test.ws.jaxws.calendar;
Property changes on: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/calendar/package-info.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 8 months
JBossWS SVN: r18580 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-04-22 05:40:40 -0400 (Tue, 22 Apr 2014)
New Revision: 18580
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
Log:
[JBPAPP-10549] Fix for jaxws 2.1 additions
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2014-04-18 04:47:06 UTC (rev 18579)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2014-04-22 09:40:40 UTC (rev 18580)
@@ -170,7 +170,7 @@
{
String methodName = method.getName();
Class retType = method.getReturnType();
- if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType))
+ if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType) && method.getParameterTypes().length == 0)
{
port = method.invoke(target, new Object[0]);
target = port;
10 years, 8 months
JBossWS SVN: r18579 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-04-18 00:47:06 -0400 (Fri, 18 Apr 2014)
New Revision: 18579
Modified:
stack/cxf/trunk/pom.xml
Log:
[JBWS-3787]:Upgrade to Apache CXF 2.7.11
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-04-16 07:07:40 UTC (rev 18578)
+++ stack/cxf/trunk/pom.xml 2014-04-18 04:47:06 UTC (rev 18579)
@@ -71,7 +71,7 @@
<wildfly800.version>8.0.0.Final</wildfly800.version>
<wildfly801.version>8.0.1.Final-SNAPSHOT</wildfly801.version>
<ejb.api.version>1.0.2.Final</ejb.api.version>
- <cxf.version>2.7.10</cxf.version>
+ <cxf.version>2.7.11</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.6.1</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
@@ -105,7 +105,7 @@
<velocity.version>1.7</velocity.version>
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.5.6</xmlsec.version>
- <wss4j.version>1.6.14</wss4j.version>
+ <wss4j.version>1.6.15</wss4j.version>
<wstx.version>4.2.0</wstx.version>
<spring.version>3.0.7.RELEASE</spring.version>
<shrinkwrap.version>1.1.3</shrinkwrap.version>
10 years, 8 months
JBossWS SVN: r18578 - stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172.
by jbossws-commits＠lists.jboss.org
Author: soul2zimate
Date: 2014-04-16 03:07:40 -0400 (Wed, 16 Apr 2014)
New Revision: 18578
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java
Log:
JBPAPP-10869, extra fix for JBWS1172TestCase
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2014-04-15 07:39:59 UTC (rev 18577)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2014-04-16 07:07:40 UTC (rev 18578)
@@ -63,7 +63,7 @@
public void testSchemaValidationPositive() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- Map<String, byte[]> xsdStreams = new SchemaExtractor(wsdlURL).getSchemas();
+ Map<String, byte[]> xsdStreams = new SchemaExtractor(wsdlURL).getSchemasFromWsdl();
String inxml = "<tns:performTest xmlns:tns='http://www.my-company.it/ws/my-test'><Code>1000</Code></tns:performTest>";
new SchemaValidationHelper(xsdStreams).validateDocument(inxml);
}
@@ -71,7 +71,7 @@
public void testSchemaValidationNegative() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
- Map<String, byte[]> xsdStreams = new SchemaExtractor(wsdlURL).getSchemas();
+ Map<String, byte[]> xsdStreams = new SchemaExtractor(wsdlURL).getSchemasFromWsdl();
String inxml = "<tns:performTest xmlns:tns='http://www.my-company.it/ws/my-test'><Code>2000</Code></tns:performTest>";
try
{
@@ -87,7 +87,7 @@
public void testEndpointWsdlValidation() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1172/noval?wsdl");
- Map<String, byte[]> xsdStreams = new SchemaExtractor(wsdlURL).getSchemas();
+ Map<String, byte[]> xsdStreams = new SchemaExtractor(wsdlURL).getSchemasFromWsdl();
String inxml = "<tns:performTest xmlns:tns='http://www.my-company.it/ws/my-test'><Code>1000</Code></tns:performTest>";
new SchemaValidationHelper(xsdStreams).validateDocument(inxml);
}
10 years, 8 months
JBossWS SVN: r18577 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsse.
by jbossws-commits＠lists.jboss.org
Author: soul2zimate
Date: 2014-04-15 03:39:59 -0400 (Tue, 15 Apr 2014)
New Revision: 18577
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsse/RequireEncryption.java
Log:
JBPAPP-11082, last r18575 is wrong, serialVersionUID change is indispensable, correct it back
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsse/RequireEncryption.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsse/RequireEncryption.java 2014-04-11 11:15:14 UTC (rev 18576)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsse/RequireEncryption.java 2014-04-15 07:39:59 UTC (rev 18577)
@@ -30,7 +30,7 @@
*/
public class RequireEncryption extends Targetable
{
- private static final long serialVersionUID = 3765798680988205647L;
+ private static final long serialVersionUID = 3765798680988205648L;
private boolean includeFaults;
10 years, 8 months