JBossWS SVN: r17536 - in stack/cxf/trunk/modules/testsuite: cxf-tests/scripts and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-05-07 13:27:56 -0400 (Tue, 07 May 2013)
New Revision: 17536
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/AnotherServiceImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/ServiceIface.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/ServiceImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsdd/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsdd/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsdd/WEB-INF/jboss-webservices.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3596] Adding WS-Discovery testcase - currently disabled waiting for CXF-5005 to be included in a release
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2013-05-07 17:24:29 UTC (rev 17535)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2013-05-07 17:27:56 UTC (rev 17536)
@@ -107,6 +107,28 @@
</classes>
</war>
+ <!-- jaxws-samples-wsdd -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsdd.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsdd/ServiceIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsdd/ServiceImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsdd/WEB-INF">
+ <include name="jboss-webservices.xml"/>
+ </webinf>
+ </war>
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsdd2.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsdd/ServiceIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsdd/*ServiceImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsdd/WEB-INF">
+ <include name="jboss-webservices.xml"/>
+ </webinf>
+ </war>
+
<!-- jaxws-samples-wsrm -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm-api.war"
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/AnotherServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/AnotherServiceImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/AnotherServiceImpl.java 2013-05-07 17:27:56 UTC (rev 17536)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.samples.wsdd;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ portName = "AnotherWSDDPort",
+ serviceName = "AnotherWSDDService",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsdd",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsdd.ServiceIface"
+)
+public class AnotherServiceImpl implements ServiceIface
+{
+ public String greet(String name)
+ {
+ System.out.println("Hi " + name);
+ return "Hi " + name;
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/ServiceIface.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/ServiceIface.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/ServiceIface.java 2013-05-07 17:27:56 UTC (rev 17536)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.samples.wsdd;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsdd"
+)
+public interface ServiceIface
+{
+ @WebMethod
+ String greet(String name);
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/ServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/ServiceImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/ServiceImpl.java 2013-05-07 17:27:56 UTC (rev 17536)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.samples.wsdd;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ portName = "WSDDPort",
+ serviceName = "WSDDService",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsdd",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsdd.ServiceIface"
+)
+public class ServiceImpl implements ServiceIface
+{
+ public String greet(String name)
+ {
+ System.out.println("Greetings " + name);
+ return "Greetings " + name;
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2013-05-07 17:27:56 UTC (rev 17536)
@@ -0,0 +1,136 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.samples.wsdd;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+
+import junit.framework.Test;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.ws.discovery.WSDiscoveryClient;
+import org.apache.cxf.ws.discovery.wsdl.ProbeMatchType;
+import org.apache.cxf.ws.discovery.wsdl.ProbeMatchesType;
+import org.apache.cxf.ws.discovery.wsdl.ProbeType;
+import org.apache.cxf.ws.discovery.wsdl.ResolveMatchType;
+import org.apache.cxf.ws.discovery.wsdl.ScopesType;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * WS-Discovery 1.1 sample
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 07-May-2013
+ */
+public final class WSDiscoveryTestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(WSDiscoveryTestCase.class, "jaxws-samples-wsdd.war,jaxws-samples-wsdd2.war");
+ }
+
+ public void testProbeAndResolve() throws Exception
+ {
+ Bus bus = null;
+ try {
+ bus = BusFactory.newInstance().createBus();
+
+ WSDiscoveryClient client = new WSDiscoveryClient(bus);
+ ProbeType pt = new ProbeType();
+ ScopesType scopes = new ScopesType();
+ pt.setScopes(scopes);
+ ProbeMatchesType pmts = client.probe(pt);
+ assertNotNull(pmts);
+ assertEquals(3, pmts.getProbeMatch().size());
+ List<ResolveMatchType> rmts = new LinkedList<ResolveMatchType>();
+ for (ProbeMatchType pmt : pmts.getProbeMatch()) {
+ rmts.add(client.resolve(pmt.getEndpointReference()));
+ }
+
+ final QName typeName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsdd", "ServiceIface");
+ checkResolveMatches(rmts, "http://" + getServerHost() + ":8080/jaxws-samples-wsdd/WSDDService", typeName);
+ checkResolveMatches(rmts, "http://" + getServerHost() + ":8080/jaxws-samples-wsdd2/WSDDService", typeName);
+ checkResolveMatches(rmts, "http://" + getServerHost() + ":8080/jaxws-samples-wsdd2/AnotherWSDDService", typeName);
+ } finally {
+ bus.shutdown(true);
+ }
+ }
+
+ public void testInvocation() throws Exception
+ {
+ Bus bus = null;
+ try {
+ bus = BusFactory.newInstance().createBus();
+
+ WSDiscoveryClient client = new WSDiscoveryClient(bus);
+ ProbeType pt = new ProbeType();
+ ScopesType scopes = new ScopesType();
+ pt.setScopes(scopes);
+ ProbeMatchesType pmts = client.probe(pt);
+ assertNotNull(pmts);
+ assertEquals(3, pmts.getProbeMatch().size());
+ List<ResolveMatchType> rmts = new LinkedList<ResolveMatchType>();
+ for (ProbeMatchType pmt : pmts.getProbeMatch()) {
+ rmts.add(client.resolve(pmt.getEndpointReference()));
+ }
+
+ int i = 0;
+ for (ResolveMatchType rmt : rmts) {
+ i++;
+ ServiceIface port = rmt.getEndpointReference().getPort(ServiceIface.class);
+ String address = rmt.getXAddrs().iterator().next();
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address);
+ String expected = address.contains("AnotherWSDDService") ? "Hi " : "Greetings ";
+ assertEquals(expected + "Alice" + i, port.greet("Alice" + i));
+ }
+ } finally {
+ bus.shutdown(true);
+ }
+ }
+
+ private void checkResolveMatches(List<ResolveMatchType> rmts, String address, QName type) {
+ List<ResolveMatchType> rmtList = getByAddress(rmts, address);
+ assertEquals(1, rmtList.size());
+ assertEquals(type, rmtList.get(0).getTypes().iterator().next());
+ }
+
+ private List<ResolveMatchType> getByAddress(List<ResolveMatchType> rmts, String address)
+ {
+ List<ResolveMatchType> list = new LinkedList<ResolveMatchType>();
+ for (ResolveMatchType rmt : rmts)
+ {
+ for (String addr : rmt.getXAddrs())
+ {
+ if (address.equals(addr))
+ {
+ list.add(rmt);
+ }
+ }
+ }
+ return list;
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsdd/WEB-INF/jboss-webservices.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsdd/WEB-INF/jboss-webservices.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsdd/WEB-INF/jboss-webservices.xml 2013-05-07 17:27:56 UTC (rev 17536)
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8"?>
+<webservices
+ xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="1.2"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee">
+
+ <property>
+ <name>cxf.ws-discovery.enabled</name>
+ <value>true</value>
+ </property>
+
+</webservices>
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2013-05-07 17:24:29 UTC (rev 17535)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-05-07 17:27:56 UTC (rev 17536)
@@ -641,6 +641,9 @@
<!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
<exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
+ <!--# [CXF-5005] Wrong EPR match in WSDiscoveryProvider::handleResolve -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase**</exclude>
+
<!--# [JBWS-2561] XOP request not properly inlined-->
<exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
@@ -702,6 +705,9 @@
<!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
<exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
+ <!--# [CXF-5005] Wrong EPR match in WSDiscoveryProvider::handleResolve -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase**</exclude>
+
<!--# [JBWS-2561] XOP request not properly inlined-->
<exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
@@ -763,6 +769,9 @@
<!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
<exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
+ <!--# [CXF-5005] Wrong EPR match in WSDiscoveryProvider::handleResolve -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase**</exclude>
+
<!--# [JBWS-2561] XOP request not properly inlined-->
<exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
@@ -825,6 +834,9 @@
<!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
<exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
+ <!--# [CXF-5005] Wrong EPR match in WSDiscoveryProvider::handleResolve -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase**</exclude>
+
<!--# [JBWS-2561] XOP request not properly inlined-->
<exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
11 years, 8 months
- 1
- 0
JBossWS SVN: r17535 - in stack/cxf/trunk: modules/client and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-05-07 13:24:29 -0400 (Tue, 07 May 2013)
New Revision: 17535
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/trunk/pom.xml
Log:
[JBWS-3596] Provide support for WS-Discovery
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2013-05-07 09:04:16 UTC (rev 17534)
+++ stack/cxf/trunk/modules/client/pom.xml 2013-05-07 17:24:29 UTC (rev 17535)
@@ -110,6 +110,10 @@
<artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cxf.services.ws-discovery</groupId>
+ <artifactId>cxf-services-ws-discovery-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-boolean</artifactId>
</dependency>
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java 2013-05-07 09:04:16 UTC (rev 17534)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java 2013-05-07 17:24:29 UTC (rev 17535)
@@ -42,4 +42,5 @@
public static final String CXF_POLICY_ALTERNATIVE_SELECTOR_PROP = "cxf.policy.alternativeSelector";
public static final String CXF_MANAGEMENT_ENABLED = "cxf.management.enabled";
public static final String CXF_MANAGEMENT_INSTALL_RESPONSE_TIME_INTERCEPTORS = "cxf.management.installResponseTimeInterceptors";
+ public static final String CXF_WS_DISCOVERY_ENABLED = "cxf.ws-discovery.enabled";
}
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-05-07 09:04:16 UTC (rev 17534)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-05-07 17:24:29 UTC (rev 17535)
@@ -40,6 +40,7 @@
<include>org.jboss.com.sun.httpserver:httpserver:jar</include>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.services.sts:cxf-services-sts-core:jar</include>
+ <include>org.apache.cxf.services.ws-discovery:cxf-services-ws-discovery-api:jar</include>
<include>org.apache.cxf.xjcplugins:cxf-*</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
<include>com.sun.xml.bind:jaxb-xjc:jar</include>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2013-05-07 09:04:16 UTC (rev 17534)
+++ stack/cxf/trunk/modules/server/pom.xml 2013-05-07 17:24:29 UTC (rev 17535)
@@ -114,6 +114,10 @@
<artifactId>cxf-services-sts-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cxf.services.ws-discovery</groupId>
+ <artifactId>cxf-services-ws-discovery-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-boolean</artifactId>
</dependency>
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-05-07 09:04:16 UTC (rev 17534)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-05-07 17:24:29 UTC (rev 17535)
@@ -30,6 +30,7 @@
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
import org.apache.cxf.configuration.Configurer;
+import org.apache.cxf.endpoint.ServerLifeCycleManager;
import org.apache.cxf.management.InstrumentationManager;
import org.apache.cxf.management.counters.CounterRepository;
import org.apache.cxf.management.interceptor.ResponseTimeMessageInInterceptor;
@@ -40,6 +41,7 @@
import org.apache.cxf.workqueue.AutomaticWorkQueue;
import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
import org.apache.cxf.workqueue.WorkQueueManager;
+import org.apache.cxf.ws.discovery.listeners.WSDiscoveryServerListener;
import org.apache.cxf.ws.policy.AlternativeSelector;
import org.apache.cxf.ws.policy.PolicyEngine;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
@@ -109,6 +111,7 @@
setAdditionalWorkQueues(bus, props);
setCXFManagement(bus, props);
+ setWSDiscovery(bus, props);
}
@@ -225,6 +228,15 @@
}
}
+ protected static void setWSDiscovery(Bus bus, Map<String, String> props) {
+ if (props != null && !props.isEmpty()) {
+ final String p = props.get(Constants.CXF_WS_DISCOVERY_ENABLED);
+ if ("true".equalsIgnoreCase(p) || "1".equalsIgnoreCase(p)) {
+ bus.getExtension(ServerLifeCycleManager.class).registerListener(new WSDiscoveryServerListener(bus));
+ }
+ }
+ }
+
private static AlternativeSelector getAlternativeSelector(Map<String, String> props) {
//default to MaximalAlternativeSelector on server side [JBWS-3149]
AlternativeSelector selector = new MaximalAlternativeSelector();
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-05-07 09:04:16 UTC (rev 17534)
+++ stack/cxf/trunk/pom.xml 2013-05-07 17:24:29 UTC (rev 17535)
@@ -659,6 +659,17 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf.services.ws-discovery</groupId>
+ <artifactId>cxf-services-ws-discovery-api</artifactId>
+ <version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-udp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-core</artifactId>
<version>${cxf.version}</version>
11 years, 8 months
- 1
- 0
JBossWS SVN: r17534 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-05-07 05:04:16 -0400 (Tue, 07 May 2013)
New Revision: 17534
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/HelloWorld.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/HelloWorldImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/TestServlet.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/udp/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/udp/META-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/udp/META-INF/wsdl/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/udp/META-INF/wsdl/HelloWorldService.wsdl
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3595] Adding testcase for SOAP-over-UDP usage with endpoints declared using JAXWS Endpoint publish API
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-05-07 09:01:55 UTC (rev 17533)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-05-07 09:04:16 UTC (rev 17534)
@@ -381,6 +381,21 @@
</manifest>
</jar>
+ <!-- jaxws-cxf-udp-api -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-udp-api.war"
+ needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/udp/TestServlet.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/udp/HelloWorld*.class"/>
+ </classes>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/cxf/udp/META-INF/wsdl"
+ prefix="WEB-INF/classes/META-INF/wsdl"/>
+ <manifest>
+ <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services"/>
+ </manifest>
+ </war>
+
<!-- jaxws-cxf-spring -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-spring.war" needxmlfile='false'>
<classes dir="${tests.output.dir}/test-classes">
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/HelloWorld.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/HelloWorld.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/HelloWorld.java 2013-05-07 09:04:16 UTC (rev 17534)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.cxf.udp;
+
+import javax.jws.WebService;
+
+@WebService(targetNamespace = "http://org.jboss.ws/jaxws/cxf/udp")
+public interface HelloWorld
+{
+ String echo(String input);
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/HelloWorldImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/HelloWorldImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/HelloWorldImpl.java 2013-05-07 09:04:16 UTC (rev 17534)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.cxf.udp;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ portName = "HelloWorldImplPort",
+ serviceName = "HelloWorldService",
+ wsdlLocation = "META-INF/wsdl/HelloWorldService.wsdl",
+ endpointInterface = "org.jboss.test.ws.jaxws.cxf.udp.HelloWorld",
+ targetNamespace = "http://org.jboss.ws/jaxws/cxf/udp"
+)
+public class HelloWorldImpl implements HelloWorld
+{
+ public String echo(String input)
+ {
+ System.out.println("input: " + input);
+ return input;
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/TestServlet.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/TestServlet.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/TestServlet.java 2013-05-07 09:04:16 UTC (rev 17534)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.cxf.udp;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+
+@WebServlet(name = "TestServlet", urlPatterns = "/*")
+public class TestServlet extends HttpServlet
+{
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ try
+ {
+ boolean result = false;
+ //start a new bus to avoid affecting the one that could already be assigned to this thread
+ Bus bus = BusFactory.newInstance().createBus();
+ BusFactory.setThreadDefaultBus(bus);
+ Object implementor = new HelloWorldImpl();
+ final String address = "soap.udp://" + getHost() + ":9435";
+ //Endpoint ep = Endpoint.publish("soap.udp://:9435", implementor);
+ Endpoint ep = Endpoint.publish(address, implementor);
+ try
+ {
+ final QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/udp", "HelloWorldService");
+ final QName udpPortName = new QName("http://org.jboss.ws/jaxws/cxf/udp", "UDPHelloWorldImplPort");
+ Service service = Service.create(serviceName);
+ service.addPort(udpPortName, "http://schemas.xmlsoap.org/soap/", address);
+ HelloWorld proxy = (HelloWorld) service.getPort(udpPortName, HelloWorld.class);
+ result = "Hi".equals(proxy.echo("Hi"));
+ }
+ finally
+ {
+ ep.stop();
+ bus.shutdown(true);
+ }
+ res.getWriter().print(result);
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+ throw new ServletException(t);
+ }
+ }
+
+ private static String getHost() {
+ String hostName = System.getProperty("jboss.bind.address", "localhost");
+ if (hostName.startsWith(":"))
+ {
+ hostName = "[" + hostName + "]";
+ }
+ return hostName;
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2013-05-07 09:04:16 UTC (rev 17534)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.cxf.udp;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Test case for publishing a UDP (SOAP-over-UDP 1.1) endpoint through API
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 6-May-2013
+ */
+public final class UDPEndpointAPITestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(UDPEndpointAPITestCase.class, "jaxws-cxf-udp-api.war");
+ }
+
+ public void testServerSide() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-udp-api");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("true", br.readLine());
+ }
+
+ public void testClientSide() throws Exception
+ {
+ Bus bus = BusFactory.newInstance().createBus();
+ BusFactory.setThreadDefaultBus(bus);
+ Object implementor = new HelloWorldImpl();
+ Endpoint ep = Endpoint.publish("soap.udp://:9436", implementor);
+ try
+ {
+ final QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/udp", "HelloWorldService");
+ final QName udpPortName = new QName("http://org.jboss.ws/jaxws/cxf/udp", "UDPHelloWorldImplPort");
+ Service service = Service.create(serviceName);
+ service.addPort(udpPortName, "http://schemas.xmlsoap.org/soap/", "soap.udp://:9436");
+ HelloWorld proxy = (HelloWorld) service.getPort(udpPortName, HelloWorld.class);
+ assertEquals("Hi", proxy.echo("Hi"));
+ }
+ finally
+ {
+ ep.stop();
+ bus.shutdown(true);
+ }
+ }
+
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/udp/META-INF/wsdl/HelloWorldService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/udp/META-INF/wsdl/HelloWorldService.wsdl (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/udp/META-INF/wsdl/HelloWorldService.wsdl 2013-05-07 09:04:16 UTC (rev 17534)
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<wsdl:definitions name="HelloWorldService" targetNamespace="http://org.jboss.ws/jaxws/cxf/udp"
+ xmlns:ns1="http://schemas.xmlsoap.org/soap/http"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://org.jboss.ws/jaxws/cxf/udp"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+<xs:schema elementFormDefault="unqualified" targetNamespace="http://org.jboss.ws/jaxws/cxf/udp" version="1.0" xmlns:tns="http://org.jboss.ws/jaxws/cxf/udp" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:element name="echo" type="tns:echo"/>
+<xs:element name="echoResponse" type="tns:echoResponse"/>
+<xs:complexType name="echo">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="arg0" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+<xs:complexType name="echoResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="return" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
+ </wsdl:types>
+ <wsdl:message name="echoResponse">
+ <wsdl:part element="tns:echoResponse" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echo">
+ <wsdl:part element="tns:echo" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="HelloWorld">
+ <wsdl:operation name="echo">
+ <wsdl:input message="tns:echo" name="echo">
+ </wsdl:input>
+ <wsdl:output message="tns:echoResponse" name="echoResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="HelloWorldServiceSoapBinding" type="tns:HelloWorld">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="echo">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="echo">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="echoResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="HelloWorldService">
+ <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort">
+ <soap:address location="host:port"/> <!-- to be rewritten -->
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
11 years, 8 months
- 1
- 0
JBossWS SVN: r17533 - in stack/cxf/trunk/modules: dist and 23 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-05-07 05:01:55 -0400 (Tue, 07 May 2013)
New Revision: 17533
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-3595] Adding jbossws-cxf-transports-udp module
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/client/pom.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -42,6 +42,11 @@
<artifactId>jbossws-cxf-transports-httpserver</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-transports-udp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- CXF dependencies -->
<dependency>
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/dist/pom.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -30,6 +30,12 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-transports-udp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
<classifier>jboss712</classifier>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -33,6 +33,7 @@
<include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-server:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include>
+ <include>org.jboss.ws.cxf:jbossws-cxf-transports-udp:jar</include>
<include>org.jboss.ws.native:jbossws-native-core:jar</include>
<include>org.jboss.ws.native:jbossws-native-services:jar</include>
<include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -57,6 +57,16 @@
<include path="META-INF"/>
</exports>
</module>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true">
+ <imports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </exports>
+ </module>
<module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/>
<!-- Do not import services from cxf module directly, those need to come from jbossws -->
<module name="org.apache.cxf.impl" export="true">
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -45,6 +45,7 @@
<!-- Apache CXF APIs only -->
<module name="org.apache.cxf" export="true" />
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" />
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export" />
<module name="org.jboss.jaxbintros" export="true"/>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -54,6 +54,12 @@
<include path="META-INF/"/>
</imports>
</module>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+ <include path="META-INF/"/>
+ </imports>
+ </module>
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="org.apache.ws.security" />
Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-transports-udp">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.annotation.api" />
+ <module name="javax.xml.ws.api" />
+ <module name="org.apache.cxf.impl" services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+ <include path="META-INF/"/>
+ </imports>
+ </module>
+ </dependencies>
+</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -51,6 +51,12 @@
<include path="META-INF/"/>
</imports>
</module>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+ <include path="META-INF/"/>
+ </imports>
+ </module>
<module name="org.apache.log4j" />
<module name="org.apache.neethi" />
<module name="org.jboss.logging" />
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -60,6 +60,16 @@
<include path="META-INF"/>
</exports>
</module>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true">
+ <imports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </exports>
+ </module>
<module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/>
<!-- Do not import services from cxf module directly, those need to come from jbossws -->
<module name="org.apache.cxf.impl" export="true">
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -45,6 +45,7 @@
<!-- Apache CXF APIs only -->
<module name="org.apache.cxf" export="true" />
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" />
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export" />
<module name="org.jboss.jaxbintros" export="true"/>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -58,6 +58,12 @@
<include path="META-INF/"/>
</imports>
</module>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+ <include path="META-INF/"/>
+ </imports>
+ </module>
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="org.apache.ws.security" />
Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-transports-udp">
+
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.annotation.api" />
+ <module name="javax.xml.ws.api" />
+ <module name="org.apache.cxf.impl" services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+ <include path="META-INF/"/>
+ </imports>
+ </module>
+ </dependencies>
+</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -55,6 +55,12 @@
<include path="META-INF/"/>
</imports>
</module>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+ <include path="META-INF/"/>
+ </imports>
+ </module>
<module name="org.apache.log4j" />
<module name="org.apache.neethi" />
<module name="org.jboss.logging" />
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -60,6 +60,16 @@
<include path="META-INF"/>
</exports>
</module>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true">
+ <imports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </exports>
+ </module>
<module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/>
<!-- Do not import services from cxf module directly, those need to come from jbossws -->
<module name="org.apache.cxf.impl" export="true">
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -45,6 +45,7 @@
<!-- Apache CXF APIs only -->
<module name="org.apache.cxf" export="true" />
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" />
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export" />
<module name="org.jboss.jaxbintros" export="true"/>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -58,6 +58,12 @@
<include path="META-INF/"/>
</imports>
</module>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+ <include path="META-INF/"/>
+ </imports>
+ </module>
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="org.apache.ws.security" />
Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-transports-udp">
+
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.annotation.api" />
+ <module name="javax.xml.ws.api" />
+ <module name="org.apache.cxf.impl" services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+ <include path="META-INF/"/>
+ </imports>
+ </module>
+ </dependencies>
+</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -55,6 +55,12 @@
<include path="META-INF/"/>
</imports>
</module>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+ <include path="META-INF/"/>
+ </imports>
+ </module>
<module name="org.apache.log4j" />
<module name="org.apache.neethi" />
<module name="org.jboss.logging" />
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-05-06 14:34:16 UTC (rev 17532)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-05-07 09:01:55 UTC (rev 17533)
@@ -60,6 +60,11 @@
<include name="**/jbossws-cxf-transports-httpserver.jar"/>
</fileset>
</copy>
+ <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main" flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-transports-udp.jar"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/cxf-api*.jar"/>
@@ -167,6 +172,11 @@
<include name="**/jbossws-cxf-transports-httpserver.jar"/>
</fileset>
</copy>
+ <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main" flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-cxf-transports-udp.jar"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-core/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossws-native-core.jar"/>
11 years, 8 months
- 1
- 0
JBossWS SVN: r17532 - stack/cxf/trunk/modules/addons/transports/udp.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-05-06 10:34:16 -0400 (Mon, 06 May 2013)
New Revision: 17532
Modified:
stack/cxf/trunk/modules/addons/transports/udp/
Log:
Setting svn:ignore
Property changes on: stack/cxf/trunk/modules/addons/transports/udp
___________________________________________________________________
Added: svn:ignore
+ target
.classpath
.project
.settings
11 years, 8 months
- 1
- 0
JBossWS SVN: r17531 - in stack/cxf/trunk/modules/addons: transports and 26 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-05-06 10:33:28 -0400 (Mon, 06 May 2013)
New Revision: 17531
Added:
stack/cxf/trunk/modules/addons/transports/udp/
stack/cxf/trunk/modules/addons/transports/udp/pom.xml
stack/cxf/trunk/modules/addons/transports/udp/src/
stack/cxf/trunk/modules/addons/transports/udp/src/main/
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/Messages.properties
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPConduit.java
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPDestination.java
stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportFactory.java
stack/cxf/trunk/modules/addons/transports/udp/src/main/resources/
stack/cxf/trunk/modules/addons/transports/udp/src/main/resources/META-INF/
stack/cxf/trunk/modules/addons/transports/udp/src/main/resources/META-INF/cxf/
stack/cxf/trunk/modules/addons/transports/udp/src/main/resources/META-INF/cxf/bus-extensions.txt
stack/cxf/trunk/modules/addons/transports/udp/src/test/
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/Greeter.java
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/GreeterImpl.java
stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportTest.java
stack/cxf/trunk/modules/addons/transports/udp/src/test/resources/
Modified:
stack/cxf/trunk/modules/addons/pom.xml
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
Log:
[JBWS-3595] Initial implementation of alternative udp transport (no Mina dependency, direct java.io usage for any type of datagram)
Modified: stack/cxf/trunk/modules/addons/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/pom.xml 2013-05-03 07:03:22 UTC (rev 17530)
+++ stack/cxf/trunk/modules/addons/pom.xml 2013-05-06 14:33:28 UTC (rev 17531)
@@ -17,6 +17,7 @@
<!-- Modules -->
<modules>
<module>transports/http/httpserver</module>
+ <module>transports/udp</module>
</modules>
</project>
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2013-05-03 07:03:22 UTC (rev 17530)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2013-05-06 14:33:28 UTC (rev 17531)
@@ -155,7 +155,7 @@
}
catch (Exception e)
{
- LOG.throwing(Handler.class.getName(), "handle(com.sun.net.httpserver.HttpExchange ex)", e);
+ LOG.throwing(Handler.class.getName(), "handle(" + HttpExchange.class.getName() + " ex)", e);
if (e instanceof IOException)
{
throw (IOException) e;
Added: stack/cxf/trunk/modules/addons/transports/udp/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/pom.xml (rev 0)
+++ stack/cxf/trunk/modules/addons/transports/udp/pom.xml 2013-05-06 14:33:28 UTC (rev 17531)
@@ -0,0 +1,31 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack CXF UDP transport</name>
+ <artifactId>jbossws-cxf-transports-udp</artifactId>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-addons</artifactId>
+ <version>4.2.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!-- CXF dependencies -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Added: stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/Messages.properties
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/Messages.properties (rev 0)
+++ stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/Messages.properties 2013-05-06 14:33:28 UTC (rev 17531)
@@ -0,0 +1 @@
+
Added: stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPConduit.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPConduit.java (rev 0)
+++ stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPConduit.java 2013-05-06 14:33:28 UTC (rev 17531)
@@ -0,0 +1,236 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.wsf.stack.cxf.addons.transports.udp;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.InterfaceAddress;
+import java.net.MulticastSocket;
+import java.net.NetworkInterface;
+import java.net.URI;
+import java.util.Enumeration;
+import java.util.logging.Logger;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.helpers.LoadingByteArrayOutputStream;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.transport.AbstractConduit;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
+/**
+ * A modified version of Apache CXF org.apache.cxf.transport.udp.UDPConduit
+ * that does not rely on Apache Mina and directly uses basic java.io for
+ * any type of datagram.
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class UDPConduit extends AbstractConduit
+{
+ private static final String MULTI_RESPONSE_TIMEOUT = "udp.multi.response.timeout";
+
+ private static final Logger LOG = LogUtils.getL7dLogger(UDPDestination.class);
+
+ Bus bus;
+
+ public UDPConduit(EndpointReferenceType t, final Bus bus)
+ {
+ super(t);
+ this.bus = bus;
+ }
+
+ private void dataReceived(Message message, byte bytes[], boolean async)
+ {
+ final Message inMessage = new MessageImpl();
+ inMessage.setExchange(message.getExchange());
+ message.getExchange().setInMessage(inMessage);
+ inMessage.setContent(InputStream.class, new ByteArrayInputStream(bytes));
+ incomingObserver.onMessage(inMessage);
+ if (!message.getExchange().isSynchronous())
+ {
+ message.getExchange().setInMessage(null);
+ }
+ }
+
+ public void prepare(final Message message) throws IOException
+ {
+ try
+ {
+ String address = (String) message.get(Message.ENDPOINT_ADDRESS);
+ if (StringUtils.isEmpty(address))
+ {
+ address = this.getTarget().getAddress().getValue();
+ }
+ URI uri = new URI(address);
+ if (StringUtils.isEmpty(uri.getHost())) { //broadcast
+ String s = uri.getSchemeSpecificPart();
+ if (s.startsWith("//:"))
+ {
+ s = s.substring(3);
+ }
+ if (s.indexOf('/') != -1)
+ {
+ s = s.substring(0, s.indexOf('/'));
+ }
+ int port = Integer.parseInt(s);
+ send(message, null, port);
+ } else {
+ InetSocketAddress isa = new InetSocketAddress(uri.getHost(), uri.getPort());
+ send(message, isa, isa.getPort());
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new IOException(ex);
+ }
+ }
+
+ private void send(Message message, InetSocketAddress isa, int port)
+ {
+ message.setContent(OutputStream.class, new SocketOutputStream(port, isa, message));
+ }
+
+ private final class SocketOutputStream extends LoadingByteArrayOutputStream
+ {
+ private final int port;
+
+ private final Message message;
+
+ private final InetSocketAddress isa;
+
+ private SocketOutputStream(int port, InetSocketAddress isa, Message message)
+ {
+ this.port = port;
+ this.message = message;
+ this.isa = isa;
+ }
+
+ public void close() throws IOException
+ {
+ super.close();
+ DatagramSocket socket = (isa != null) ? new MulticastSocket(null) : new DatagramSocket();
+ socket.setSendBufferSize(this.size());
+ socket.setReceiveBufferSize(64 * 1024);
+ socket.setBroadcast(true);
+
+ if (isa == null) //broadcast
+ {
+ Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
+ while (interfaces.hasMoreElements())
+ {
+ NetworkInterface networkInterface = interfaces.nextElement();
+ if (!networkInterface.isUp() || networkInterface.isLoopback())
+ {
+ continue;
+ }
+ for (InterfaceAddress interfaceAddress : networkInterface.getInterfaceAddresses())
+ {
+ InetAddress broadcast = interfaceAddress.getBroadcast();
+ if (broadcast == null)
+ {
+ continue;
+ }
+ DatagramPacket sendPacket = new DatagramPacket(this.getRawBytes(), 0, this.size(), broadcast, port);
+ try
+ {
+ socket.send(sendPacket);
+ }
+ catch (Exception e)
+ {
+ //ignore
+ }
+ }
+ }
+ }
+ else
+ {
+ DatagramPacket sendPacket = new DatagramPacket(this.getRawBytes(), 0, this.size(), isa);
+ try
+ {
+ socket.send(sendPacket);
+ }
+ catch (Exception e)
+ {
+ //ignore
+ }
+ }
+
+ if (!message.getExchange().isOneWay())
+ {
+ byte bytes[] = new byte[64 * 1024];
+ DatagramPacket p = new DatagramPacket(bytes, bytes.length);
+ Object to = message.getContextualProperty(MULTI_RESPONSE_TIMEOUT);
+ Integer i = null;
+ if (to instanceof String)
+ {
+ i = Integer.parseInt((String) to);
+ }
+ else if (to instanceof Integer)
+ {
+ i = (Integer) to;
+ }
+ if (i == null || i <= 0 || message.getExchange().isSynchronous())
+ {
+ socket.setSoTimeout(30000);
+ socket.receive(p);
+ dataReceived(message, bytes, false);
+ }
+ else
+ {
+ socket.setSoTimeout(i);
+ boolean found = false;
+ try
+ {
+ while (true)
+ {
+ socket.receive(p);
+ dataReceived(message, bytes, false);
+ found = true;
+ }
+ }
+ catch (java.net.SocketTimeoutException ex)
+ {
+ if (!found)
+ {
+ throw ex;
+ }
+ }
+ }
+ }
+ socket.close();
+ }
+ }
+
+ protected Logger getLogger()
+ {
+ return LOG;
+ }
+
+}
Added: stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPDestination.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPDestination.java (rev 0)
+++ stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPDestination.java 2013-05-06 14:33:28 UTC (rev 17531)
@@ -0,0 +1,227 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.wsf.stack.cxf.addons.transports.udp;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetSocketAddress;
+import java.net.MulticastSocket;
+import java.net.URI;
+import java.util.logging.Logger;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.helpers.LoadingByteArrayOutputStream;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.ExchangeImpl;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.transport.AbstractDestination;
+import org.apache.cxf.transport.Conduit;
+import org.apache.cxf.workqueue.AutomaticWorkQueue;
+import org.apache.cxf.workqueue.WorkQueueManager;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
+/**
+ * A modified version of Apache CXF org.apache.cxf.transport.udp.UDPDestination
+ * that does not rely on Apache Mina and directly uses basic java.io for any
+ * type of datagram.
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class UDPDestination extends AbstractDestination
+{
+ private static final Logger LOG = LogUtils.getL7dLogger(UDPDestination.class);
+
+ AutomaticWorkQueue queue;
+
+ volatile DatagramSocket socket;
+
+ public UDPDestination(Bus b, EndpointReferenceType ref, EndpointInfo ei)
+ {
+ super(b, ref, ei);
+ }
+
+ class SocketListener implements Runnable
+ {
+ public void run()
+ {
+ while (true)
+ {
+ if (socket == null)
+ {
+ return;
+ }
+ try
+ {
+ byte bytes[] = new byte[64 * 1024];
+ final DatagramPacket p = new DatagramPacket(bytes, bytes.length);
+ socket.receive(p);
+
+ LoadingByteArrayOutputStream out = new LoadingByteArrayOutputStream()
+ {
+ public void close() throws IOException
+ {
+ super.close();
+ final DatagramPacket p2 = new DatagramPacket(getRawBytes(), 0, this.size(), p.getSocketAddress());
+ socket.send(p2);
+ }
+ };
+
+ UDPConnectionInfo info = new UDPConnectionInfo(out, new ByteArrayInputStream(bytes, 0, p.getLength()));
+
+ final MessageImpl m = new MessageImpl();
+ final Exchange exchange = new ExchangeImpl();
+ exchange.setDestination(UDPDestination.this);
+ m.setDestination(UDPDestination.this);
+ exchange.setInMessage(m);
+ m.setContent(InputStream.class, info.in);
+ m.put(UDPConnectionInfo.class, info);
+ queue.execute(new Runnable()
+ {
+ public void run()
+ {
+ getMessageObserver().onMessage(m);
+ }
+ });
+ }
+ catch (IOException e)
+ {
+ if (socket != null) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+
+ /** {@inheritDoc}*/
+ @Override
+ protected Conduit getInbuiltBackChannel(Message inMessage)
+ {
+ if (inMessage.getExchange().isOneWay())
+ {
+ return null;
+ }
+ final UDPConnectionInfo info = inMessage.get(UDPConnectionInfo.class);
+ return new AbstractBackChannelConduit()
+ {
+ public void prepare(Message message) throws IOException
+ {
+ message.setContent(OutputStream.class, info.out);
+ }
+ };
+ }
+
+ /** {@inheritDoc}*/
+ @Override
+ protected Logger getLogger()
+ {
+ return LOG;
+ }
+
+ protected void activate()
+ {
+ WorkQueueManager queuem = bus.getExtension(WorkQueueManager.class);
+ queue = queuem.getNamedWorkQueue("udp-transport");
+ if (queue == null)
+ {
+ queue = queuem.getAutomaticWorkQueue();
+ }
+
+ try
+ {
+ URI uri = new URI(this.getAddress().getAddress().getValue());
+ InetSocketAddress isa = null;
+ if (StringUtils.isEmpty(uri.getHost()))
+ {
+ String s = uri.getSchemeSpecificPart();
+ if (s.startsWith("//:"))
+ {
+ s = s.substring(3);
+ }
+ if (s.indexOf('/') != -1)
+ {
+ s = s.substring(0, s.indexOf('/'));
+ }
+ int port = Integer.parseInt(s);
+ isa = new InetSocketAddress(port);
+ }
+ else
+ {
+ isa = new InetSocketAddress(uri.getHost(), uri.getPort());
+ }
+ DatagramSocket s;
+ if (isa.getAddress().isMulticastAddress())
+ {
+ s = new MulticastSocket(null);
+ ((MulticastSocket) s).setTimeToLive(1);
+ s.bind(new InetSocketAddress(isa.getPort()));
+ ((MulticastSocket) s).joinGroup(isa.getAddress());
+ }
+ else
+ {
+ s = new DatagramSocket(null);
+ s.bind(new InetSocketAddress(isa.getAddress(), isa.getPort()));
+ }
+ s.setReuseAddress(true);
+ s.setReceiveBufferSize(64 * 1024);
+ s.setSendBufferSize(64 * 1024);
+ socket = s;
+ queue.execute(new SocketListener());
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ throw new RuntimeException(ex);
+ }
+ }
+
+ protected void deactivate()
+ {
+ if (socket != null)
+ {
+ DatagramSocket s = socket;
+ socket = null;
+ s.close();
+ }
+ }
+
+ static class UDPConnectionInfo
+ {
+ final OutputStream out;
+
+ final InputStream in;
+
+ public UDPConnectionInfo(OutputStream o, InputStream i)
+ {
+ out = o;
+ in = i;
+ }
+ }
+}
Added: stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportFactory.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportFactory.java (rev 0)
+++ stack/cxf/trunk/modules/addons/transports/udp/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportFactory.java 2013-05-06 14:33:28 UTC (rev 17531)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.wsf.stack.cxf.addons.transports.udp;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.annotation.Resource;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.transport.AbstractTransportFactory;
+import org.apache.cxf.transport.Conduit;
+import org.apache.cxf.transport.ConduitInitiator;
+import org.apache.cxf.transport.Destination;
+import org.apache.cxf.transport.DestinationFactory;
+import org.apache.cxf.ws.addressing.AttributedURIType;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+
+@NoJSR250Annotations(unlessNull = { "bus" })
+public class UDPTransportFactory extends AbstractTransportFactory
+ implements DestinationFactory, ConduitInitiator {
+
+ public static final String TRANSPORT_ID = "http://cxf.apache.org/transports/udp";
+ public static final List<String> DEFAULT_NAMESPACES
+ = Arrays.asList(TRANSPORT_ID);
+
+ private static final Logger LOG = LogUtils.getL7dLogger(UDPTransportFactory.class);
+ private static final Set<String> URI_PREFIXES = new HashSet<String>();
+ static {
+ URI_PREFIXES.add("udp://");
+ }
+
+ private Set<String> uriPrefixes = new HashSet<String>(URI_PREFIXES);
+
+ public UDPTransportFactory() {
+ this(null);
+ }
+ public UDPTransportFactory(Bus b) {
+ super(DEFAULT_NAMESPACES, null);
+ bus = b;
+ register();
+ }
+
+ @Resource(name = "cxf")
+ public void setBus(Bus b) {
+ super.setBus(b);
+ }
+
+ public Destination getDestination(EndpointInfo ei) throws IOException {
+ return getDestination(ei, null);
+ }
+
+ protected Destination getDestination(EndpointInfo ei,
+ EndpointReferenceType reference)
+ throws IOException {
+ if (reference == null) {
+ reference = createReference(ei);
+ }
+ return new UDPDestination(bus, reference, ei);
+ }
+
+
+ public Conduit getConduit(EndpointInfo ei) throws IOException {
+ return getConduit(ei, null);
+ }
+
+ public Conduit getConduit(EndpointInfo ei, EndpointReferenceType target) throws IOException {
+ LOG.log(Level.FINE, "Creating conduit for {0}", ei.getAddress());
+ if (target == null) {
+ target = createReference(ei);
+ }
+ return new UDPConduit(target, bus);
+ }
+
+
+ public Set<String> getUriPrefixes() {
+ return uriPrefixes;
+ }
+ public void setUriPrefixes(Set<String> s) {
+ uriPrefixes = s;
+ }
+ EndpointReferenceType createReference(EndpointInfo ei) {
+ EndpointReferenceType epr = new EndpointReferenceType();
+ AttributedURIType address = new AttributedURIType();
+ address.setValue(ei.getAddress());
+ epr.setAddress(address);
+ return epr;
+ }
+
+}
Added: stack/cxf/trunk/modules/addons/transports/udp/src/main/resources/META-INF/cxf/bus-extensions.txt
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/src/main/resources/META-INF/cxf/bus-extensions.txt (rev 0)
+++ stack/cxf/trunk/modules/addons/transports/udp/src/main/resources/META-INF/cxf/bus-extensions.txt 2013-05-06 14:33:28 UTC (rev 17531)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.cxf.addons.transports.udp.UDPTransportFactory::true
Added: stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/Greeter.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/Greeter.java (rev 0)
+++ stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/Greeter.java 2013-05-06 14:33:28 UTC (rev 17531)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.wsf.stack.cxf.addons.transports.udp;
+
+import javax.jws.WebService;
+
+@WebService
+public interface Greeter
+{
+ public String greetMe(String requestType);
+
+ public void pingMe();
+
+ public String sayHi();
+}
Added: stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/GreeterImpl.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/GreeterImpl.java (rev 0)
+++ stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/GreeterImpl.java 2013-05-06 14:33:28 UTC (rev 17531)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.wsf.stack.cxf.addons.transports.udp;
+
+import javax.jws.WebService;
+
+@WebService(serviceName = "SOAPService",
+ portName = "SoapPort",
+ endpointInterface = "org.jboss.wsf.stack.cxf.addons.transports.udp.Greeter",
+ targetNamespace = "http://apache.org/hello_world/services")
+public class GreeterImpl implements Greeter
+{
+ public GreeterImpl() {
+ }
+
+ public String greetMe(String requestType) {
+ return "Hello " + requestType;
+ }
+
+ public void pingMe() {
+ }
+
+ public String sayHi() {
+ return "Hi!";
+ }
+}
Added: stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportTest.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportTest.java (rev 0)
+++ stack/cxf/trunk/modules/addons/transports/udp/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/udp/UDPTransportTest.java 2013-05-06 14:33:28 UTC (rev 17531)
@@ -0,0 +1,124 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.wsf.stack.cxf.addons.transports.udp;
+
+import java.net.NetworkInterface;
+import java.util.Enumeration;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class UDPTransportTest
+{
+ private static final String PORT = "9434";
+ private static Server server;
+ private static Bus bus;
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception
+ {
+ bus = BusFactory.newInstance().createBus();
+ BusFactory.setDefaultBus(bus);
+ JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean();
+ factory.setBus(bus);
+ factory.setAddress("udp://:" + PORT);
+ factory.setServiceBean(new GreeterImpl());
+ server = factory.create();
+ }
+
+ @AfterClass
+ public static void shutdown() throws Exception
+ {
+ server.stop();
+ server = null;
+ if (bus != null) {
+ bus.shutdown(true);
+ }
+ bus = null;
+ }
+
+ @Test
+ public void testSimpleUDP() throws Exception
+ {
+ JaxWsProxyFactoryBean fact = new JaxWsProxyFactoryBean();
+ fact.setAddress("udp://localhost:" + PORT);
+ Greeter g = fact.create(Greeter.class);
+ for (int x = 0; x < 5; x++)
+ {
+ Assert.assertEquals("Hello World", g.greetMe("World"));
+ }
+
+ ((java.io.Closeable) g).close();
+ }
+
+ @Test
+ public void testBroadcastUDP() throws Exception
+ {
+ Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
+ int count = 0;
+ while (interfaces.hasMoreElements())
+ {
+ NetworkInterface networkInterface = interfaces.nextElement();
+ if (!networkInterface.isUp() || networkInterface.isLoopback())
+ {
+ continue;
+ }
+ count++;
+ }
+ if (count == 0)
+ {
+ //no non-loopbacks, cannot do broadcasts
+ System.out.println("Skipping broadcast test");
+ return;
+ }
+
+ JaxWsProxyFactoryBean fact = new JaxWsProxyFactoryBean();
+ fact.setAddress("udp://:" + PORT + "/foo");
+ Greeter g = fact.create(Greeter.class);
+ Assert.assertEquals("Hello World", g.greetMe("World"));
+ ((java.io.Closeable) g).close();
+ }
+
+ @Test
+ public void testLargeRequest() throws Exception
+ {
+ JaxWsProxyFactoryBean fact = new JaxWsProxyFactoryBean();
+ fact.setAddress("udp://localhost:" + PORT);
+ Greeter g = fact.create(Greeter.class);
+ StringBuilder b = new StringBuilder(100000);
+ for (int x = 0; x < 10000; x++)
+ {
+ b.append("Hello ");
+ }
+ Assert.assertEquals("Hello " + b.toString(), g.greetMe(b.toString()));
+
+ ((java.io.Closeable) g).close();
+ }
+}
11 years, 8 months
- 1
- 0
JBossWS SVN: r17530 - in stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests: src/test/etc and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-05-03 03:03:22 -0400 (Fri, 03 May 2013)
New Revision: 17530
Added:
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/etc/kerberos.jaas
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/DoubleItPortTypeImpl.java
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KeystorePasswordCallback.java
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/DoubleItFault.java
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/DoubleItPortType.java
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleIt.java
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleIt2.java
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleItFault.java
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleItResponse.java
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/ObjectFactory.java
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/package-info.java
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/META-INF/
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/META-INF/alice.properties
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/META-INF/bob.properties
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/alice.properties
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/bob.properties
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/web.xml
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItLogical.wsdl
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/cxf.xml
Modified:
stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
Log:
Add kerberos test
Modified: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2013-05-03 06:46:21 UTC (rev 17529)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2013-05-03 07:03:22 UTC (rev 17530)
@@ -109,7 +109,52 @@
<include name="alice.jks" />
</metainf>
</jar>
+
+
+ <!-- jaxws-samples-wsse-kerberos -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-kerberos.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/kerberos/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/kerberos/Double*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/kerberos/KeystorePasswordCallback.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/*.class"/>
+ </classes>
+
+ <classes dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/kerberos/">
+ <include name="cxf.xml"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/kerberos/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ <include name="wsdl/*"/>
+ </webinf>
+ <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/kerberos/WEB-INF" prefix="WEB-INF/classes">
+ <include name="alice.jks" />
+ <include name="alice.properties" />
+ <include name="bob.jks" />
+ <include name="bob.properties" />
+ </zipfileset>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.ws.security"/>
+ </manifest>
+ </war>
+ <!-- jaxws-samples-wsse-kerberos-client -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-kerberos-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/kerberos/META-INF">
+ <include name="alice.properties" />
+ <include name="alice.jks" />
+ <include name="bob.properties" />
+ <include name="bob.jks" />
+ </metainf>
+
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/kerberos/">
+ <include name="cxf.xml" />
+ </metainf>
+ </jar>
+
+
<!-- jaxws-samples-wsse-username -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war"
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/etc/kerberos.jaas
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/etc/kerberos.jaas (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/etc/kerberos.jaas 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,8 @@
+
+alice {
+ com.sun.security.auth.module.Krb5LoginModule required refreshKrb5Config=true useKeyTab=true keyTab="/etc/alice.keytab" principal="alice" debug="true";
+};
+
+bob {
+ com.sun.security.auth.module.Krb5LoginModule required refreshKrb5Config=true useKeyTab=true storeKey=true keyTab="/etc/bob.keytab" principal="bob/service.ws.apache.org" debug="true";
+};
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/DoubleItPortTypeImpl.java
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/DoubleItPortTypeImpl.java (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/DoubleItPortTypeImpl.java 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,40 @@
+package org.jboss.test.ws.jaxws.samples.wsse.kerberos;
+
+import java.security.Principal;
+
+import javax.annotation.Resource;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
+
+import org.jboss.test.ws.jaxws.samples.wsse.kerberos.contract.DoubleItFault;
+import org.jboss.test.ws.jaxws.samples.wsse.kerberos.contract.DoubleItPortType;
+
+@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt",
+ serviceName = "DoubleItService",
+ portName = "DoubleItKerberosSupportingPort",
+ wsdlLocation = "WEB-INF/wsdl/DoubleItKerberos.wsdl",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.kerberos.contract.DoubleItPortType")
+
+public class DoubleItPortTypeImpl implements DoubleItPortType
+{
+
+ @Resource
+ WebServiceContext wsContext;
+
+ public int doubleIt(int numberToDouble) throws DoubleItFault
+ {
+ Principal pr = wsContext.getUserPrincipal();
+
+ if (pr == null)
+ {
+ throw new DoubleItFault("Principal must not be null");
+ }
+
+ if (pr.getName() != null)
+ {
+ throw new DoubleItFault("Principal.getName() must not return null");
+ }
+ return numberToDouble * 2;
+ }
+
+}
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/DoubleItPortTypeImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,61 @@
+package org.jboss.test.ws.jaxws.samples.wsse.kerberos;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.feature.LoggingFeature;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.ws.policy.WSPolicyFeature;
+import org.apache.cxf.ws.security.kerberos.KerberosClient;
+import org.jboss.test.ws.jaxws.samples.wsse.kerberos.contract.DoubleItPortType;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+public class KerberosTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-kerberos/DoubleItKerberosSupport";
+ private final QName servicePort = new QName("http://www.example.org/contract/DoubleIt", "DoubleItKerberosSupportingPort");
+
+ public static Test suite()
+ {
+ JBossWSCXFTestSetup testSetup;
+ testSetup = new JBossWSCXFTestSetup(KerberosTestCase.class, "jaxws-samples-wsse-kerberos-client.jar jaxws-samples-wsse-kerberos.war");
+ return testSetup;
+ }
+
+ public void testKerberosSupport() throws Exception
+ {
+ QName serviceName = new QName("http://www.example.org/contract/DoubleIt", "DoubleItService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ DoubleItPortType proxy = (DoubleItPortType)service.getPort(servicePort, DoubleItPortType.class);
+ //((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:9001/DoubleItKerberosSupporting");
+ ((BindingProvider)proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, serviceURL);
+ setupWsse(proxy);
+ assertEquals(20, proxy.doubleIt(10));
+ }
+
+
+ private void setupWsse(DoubleItPortType proxy)
+ {
+ Client client = ClientProxy.getClient(proxy);
+ Endpoint cxfEndpoint = client.getEndpoint();
+ cxfEndpoint.put("ws-security.encryption.properties", Thread.currentThread().getContextClassLoader().getResource("META-INF/bob.properties"));
+ cxfEndpoint.put("ws-security.encryption.username", "bob");
+
+ client.getBus().getFeatures().add(new LoggingFeature());
+ client.getBus().getFeatures().add(new WSPolicyFeature());
+ KerberosClient kerberosClient = new KerberosClient(client.getBus());
+ kerberosClient.setServiceName("bob(a)service.ws.apache.org");
+ kerberosClient.setContextName("alice");
+ cxfEndpoint.put("ws-security.kerberos.client", kerberosClient);
+
+ }
+}
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KeystorePasswordCallback.java
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KeystorePasswordCallback.java (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KeystorePasswordCallback.java 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,38 @@
+
+package org.jboss.test.ws.jaxws.samples.wsse.kerberos;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ */
+
+public class KeystorePasswordCallback implements CallbackHandler {
+
+ public KeystorePasswordCallback() {
+ }
+
+ /**
+ * It attempts to get the password from the private
+ * alias/passwords map.
+ */
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (int i = 0; i < callbacks.length; i++) {
+ WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+ if ("alice".equals(pc.getIdentifier())) {
+ pc.setPassword("password");
+ } else if ("bob".equals(pc.getIdentifier())) {
+ pc.setPassword("password");
+ } else {
+ pc.setPassword("abcd!1234");
+ }
+ }
+ }
+
+
+}
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KeystorePasswordCallback.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/DoubleItFault.java
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/DoubleItFault.java (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/DoubleItFault.java 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,37 @@
+
+package org.jboss.test.ws.jaxws.samples.wsse.kerberos.contract;
+
+import javax.xml.ws.WebFault;
+
+@WebFault(name = "DoubleItFault", targetNamespace = "http://www.example.org/schema/DoubleIt")
+public class DoubleItFault extends Exception {
+ public static final long serialVersionUID = 1L;
+
+ private org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema.DoubleItFault doubleItFault;
+
+ public DoubleItFault() {
+ super();
+ }
+
+ public DoubleItFault(String message) {
+ super(message);
+ }
+
+ public DoubleItFault(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public DoubleItFault(String message, org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema.DoubleItFault doubleItFault) {
+ super(message);
+ this.doubleItFault = doubleItFault;
+ }
+
+ public DoubleItFault(String message, org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema.DoubleItFault doubleItFault, Throwable cause) {
+ super(message, cause);
+ this.doubleItFault = doubleItFault;
+ }
+
+ public org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema.DoubleItFault getFaultInfo() {
+ return this.doubleItFault;
+ }
+}
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/DoubleItFault.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/DoubleItPortType.java
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/DoubleItPortType.java (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/DoubleItPortType.java 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,22 @@
+package org.jboss.test.ws.jaxws.samples.wsse.kerberos.contract;
+
+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://www.example.org/contract/DoubleIt", name = "DoubleItPortType")
+(a)XmlSeeAlso({org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema.ObjectFactory.class})
+public interface DoubleItPortType {
+
+ @WebResult(name = "doubledNumber", targetNamespace = "")
+ @RequestWrapper(localName = "DoubleIt", targetNamespace = "http://www.example.org/schema/DoubleIt", className = "org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema.DoubleIt")
+ @WebMethod(operationName = "DoubleIt")
+ @ResponseWrapper(localName = "DoubleItResponse", targetNamespace = "http://www.example.org/schema/DoubleIt", className = "org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema.DoubleItResponse")
+ public int doubleIt(
+ @WebParam(name = "numberToDouble", targetNamespace = "")
+ int numberToDouble
+ ) throws DoubleItFault;
+}
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/contract/DoubleItPortType.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleIt.java
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleIt.java (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleIt.java 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,54 @@
+
+package org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="numberToDouble" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "numberToDouble"
+})
+@XmlRootElement(name = "DoubleIt")
+public class DoubleIt {
+
+ protected int numberToDouble;
+
+ /**
+ * Gets the value of the numberToDouble property.
+ *
+ */
+ public int getNumberToDouble() {
+ return numberToDouble;
+ }
+
+ /**
+ * Sets the value of the numberToDouble property.
+ *
+ */
+ public void setNumberToDouble(int value) {
+ this.numberToDouble = value;
+ }
+
+}
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleIt.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleIt2.java
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleIt2.java (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleIt2.java 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,54 @@
+
+package org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="numberToDouble" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "numberToDouble"
+})
+@XmlRootElement(name = "DoubleIt2")
+public class DoubleIt2 {
+
+ protected int numberToDouble;
+
+ /**
+ * Gets the value of the numberToDouble property.
+ *
+ */
+ public int getNumberToDouble() {
+ return numberToDouble;
+ }
+
+ /**
+ * Sets the value of the numberToDouble property.
+ *
+ */
+ public void setNumberToDouble(int value) {
+ this.numberToDouble = value;
+ }
+
+}
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleIt2.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleItFault.java
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleItFault.java (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleItFault.java 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,73 @@
+
+package org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="minor" type="{http://www.w3.org/2001/XMLSchema}short"/>
+ * <element name="major" type="{http://www.w3.org/2001/XMLSchema}short"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "minor",
+ "major"
+})
+@XmlRootElement(name = "DoubleItFault")
+public class DoubleItFault {
+
+ protected short minor;
+ protected short major;
+
+ /**
+ * Gets the value of the minor property.
+ *
+ */
+ public short getMinor() {
+ return minor;
+ }
+
+ /**
+ * Sets the value of the minor property.
+ *
+ */
+ public void setMinor(short value) {
+ this.minor = value;
+ }
+
+ /**
+ * Gets the value of the major property.
+ *
+ */
+ public short getMajor() {
+ return major;
+ }
+
+ /**
+ * Sets the value of the major property.
+ *
+ */
+ public void setMajor(short value) {
+ this.major = value;
+ }
+
+}
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleItFault.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleItResponse.java
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleItResponse.java (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleItResponse.java 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,54 @@
+
+package org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="doubledNumber" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "doubledNumber"
+})
+@XmlRootElement(name = "DoubleItResponse")
+public class DoubleItResponse {
+
+ protected int doubledNumber;
+
+ /**
+ * Gets the value of the doubledNumber property.
+ *
+ */
+ public int getDoubledNumber() {
+ return doubledNumber;
+ }
+
+ /**
+ * Sets the value of the doubledNumber property.
+ *
+ */
+ public void setDoubledNumber(int value) {
+ this.doubledNumber = value;
+ }
+
+}
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/DoubleItResponse.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/ObjectFactory.java
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/ObjectFactory.java (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/ObjectFactory.java 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,77 @@
+
+package org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema;
+
+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.example.schema.doubleit 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 _DoubleItHeader_QNAME = new QName("http://www.example.org/schema/DoubleIt", "DoubleItHeader");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.example.schema.doubleit
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link DoubleItFault }
+ *
+ */
+ public DoubleItFault createDoubleItFault() {
+ return new DoubleItFault();
+ }
+
+ /**
+ * Create an instance of {@link DoubleItResponse }
+ *
+ */
+ public DoubleItResponse createDoubleItResponse() {
+ return new DoubleItResponse();
+ }
+
+ /**
+ * Create an instance of {@link DoubleIt2 }
+ *
+ */
+ public DoubleIt2 createDoubleIt2() {
+ return new DoubleIt2();
+ }
+
+ /**
+ * Create an instance of {@link DoubleIt }
+ *
+ */
+ public DoubleIt createDoubleIt() {
+ return new DoubleIt();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.example.org/schema/DoubleIt", name = "DoubleItHeader")
+ public JAXBElement<Integer> createDoubleItHeader(Integer value) {
+ return new JAXBElement<Integer>(_DoubleItHeader_QNAME, Integer.class, null, value);
+ }
+
+}
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/ObjectFactory.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/package-info.java
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/package-info.java (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/package-info.java 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,2 @@
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.example.org/schema/DoubleIt")
+package org.jboss.test.ws.jaxws.samples.wsse.kerberos.schema;
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/schema/package-info.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/META-INF/alice.properties
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/META-INF/alice.properties (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/META-INF/alice.properties 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=alice
+org.apache.ws.security.crypto.merlin.file=META-INF/alice.jks
\ No newline at end of file
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/META-INF/alice.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/META-INF/bob.properties
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/META-INF/bob.properties (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/META-INF/bob.properties 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=bob
+org.apache.ws.security.crypto.merlin.keystore.file=META-INF/bob.jks
+
+
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/META-INF/bob.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/alice.properties
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/alice.properties (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/alice.properties 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,21 @@
+# 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.
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=alice
+org.apache.ws.security.crypto.merlin.keystore.file=alice.jks
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/alice.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/bob.properties
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/bob.properties (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/bob.properties 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=bob
+org.apache.ws.security.crypto.merlin.keystore.file=bob.jks
+
+
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/bob.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,30 @@
+<beans xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation='http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <bean id="kerberosValidator" class="org.apache.ws.security.validate.KerberosTokenValidator">
+ <property name="contextName" value="bob" />
+ <property name="serviceName" value="bob(a)service.ws.apache.org" />
+ </bean>
+
+
+
+ <jaxws:endpoint id="DoubleItKerberosSupport"
+ address="http://@jboss.bind.address@:8080/jaxws-samples-wsse-kerberos/DoubleItKerberosSupport"
+ implementor="org.jboss.test.ws.jaxws.samples.wsse.kerberos.DoubleItPortTypeImpl">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.samples.wsse.kerberos.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="bob.properties" />
+ <entry key="ws-security.bst.validator" value-ref="kerberosValidator" />
+ </jaxws:properties>
+ </jaxws:endpoint>
+
+
+</beans>
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/web.xml 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>DoubleItKerberosSupport</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.kerberos.DoubleItPortTypeImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>DoubleItKerberosSupport</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,996 @@
+<?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="DoubleIt"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/contract/DoubleIt"
+ targetNamespace="http://www.example.org/contract/DoubleIt"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsaws="http://www.w3.org/2005/08/addressing"
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
+ xmlns:sp13="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802">
+
+ <wsdl:import location="DoubleItLogical.wsdl"
+ namespace="http://www.example.org/contract/DoubleIt"/>
+
+ <wsdl:binding name="DoubleItKerberosTransportBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosTransportPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosSymmetricBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosSymmetricPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosSymmetricSupportingBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosSymmetricSupportingPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosSupportingBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosSupportingPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosAsymmetricBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosAsymmetricPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosTransportEndorsingBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosTransportEndorsingPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosAsymmetricEndorsingBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosAsymmetricEndorsingPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosSymmetricProtectionBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosSymmetricProtectionPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosSymmetricDerivedProtectionBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosSymmetricDerivedProtectionPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosAsymmetricSignedEndorsingBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosAsymmetricSignedEndorsingPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosAsymmetricSignedEncryptedBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosAsymmetricSignedEncryptedPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosSymmetricEndorsingEncryptedBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosSymmetricEndorsingEncryptedPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="DoubleItKerberosSymmetricSignedEndorsingEncryptedBinding" type="tns:DoubleItPortType">
+ <wsp:PolicyReference URI="#DoubleItKerberosSymmetricSignedEndorsingEncryptedPolicy" />
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="DoubleIt">
+ <soap:operation soapAction="" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ <wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy"/>
+ </wsdl:output>
+ <wsdl:fault name="DoubleItFault">
+ <soap:body use="literal" name="DoubleItFault" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="DoubleItService">
+ <wsdl:port name="DoubleItKerberosTransportPort" binding="tns:DoubleItKerberosTransportBinding">
+ <soap:address location="https://localhost:9009/DoubleItKerberosTransport" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosSymmetricPort"
+ binding="tns:DoubleItKerberosSymmetricBinding">
+ <soap:address location="http://localhost:9001/DoubleItKerberosSymmetric" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosSymmetricSupportingPort"
+ binding="tns:DoubleItKerberosSymmetricSupportingBinding">
+ <soap:address location="http://localhost:9001/DoubleItKerberosSymmetricSupporting" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosSupportingPort"
+ binding="tns:DoubleItKerberosSupportingBinding">
+ <soap:address location="http://localhost:9001/DoubleItKerberosSupporting" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosAsymmetricPort"
+ binding="tns:DoubleItKerberosAsymmetricBinding">
+ <soap:address location="http://localhost:9001/DoubleItKerberosAsymmetric" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosTransportEndorsingPort"
+ binding="tns:DoubleItKerberosTransportEndorsingBinding">
+ <soap:address location="https://localhost:9009/DoubleItKerberosTransportEndorsing" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosAsymmetricEndorsingPort"
+ binding="tns:DoubleItKerberosAsymmetricEndorsingBinding">
+ <soap:address location="http://localhost:9001/DoubleItKerberosAsymmetricEndorsing" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosSymmetricProtectionPort"
+ binding="tns:DoubleItKerberosSymmetricProtectionBinding">
+ <soap:address location="http://localhost:9001/DoubleItKerberosSymmetricProtection" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosSymmetricDerivedProtectionPort"
+ binding="tns:DoubleItKerberosSymmetricDerivedProtectionBinding">
+ <soap:address location="http://localhost:9001/DoubleItKerberosSymmetricDerivedProtection" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosAsymmetricSignedEndorsingPort"
+ binding="tns:DoubleItKerberosAsymmetricSignedEndorsingBinding">
+ <soap:address location="http://localhost:9001/DoubleItKerberosAsymmetricSignedEndorsing" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosAsymmetricSignedEncryptedPort"
+ binding="tns:DoubleItKerberosAsymmetricSignedEncryptedBinding">
+ <soap:address location="http://localhost:9001/DoubleItKerberosAsymmetricSignedEncrypted" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosSymmetricEndorsingEncryptedPort"
+ binding="tns:DoubleItKerberosSymmetricEndorsingEncryptedBinding">
+ <soap:address location="http://localhost:9001/DoubleItKerberosSymmetricEndorsingEncrypted" />
+ </wsdl:port>
+ <wsdl:port name="DoubleItKerberosSymmetricSignedEndorsingEncryptedPort"
+ binding="tns:DoubleItKerberosSymmetricSignedEndorsingEncryptedBinding">
+ <soap:address location="http://localhost:9001/DoubleItKerberosSymmetricSignedEndorsingEncrypted" />
+ </wsdl:port>
+ </wsdl:service>
+
+ <wsp:Policy wsu:Id="DoubleItKerberosTransportPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:TransportBinding>
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <sp:HttpsToken>
+ <wsp:Policy/>
+ </sp:HttpsToken>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax />
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp />
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128 />
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ <sp:SupportingTokens>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:SupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItKerberosSymmetricPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireThumbprintReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:SignedSupportingTokens>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItKerberosSymmetricSupportingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireThumbprintReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:SupportingTokens>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:SupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItKerberosSupportingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SupportingTokens>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:SupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItKerberosAsymmetricPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireIssuerSerialReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireIssuerSerialReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:SignedSupportingTokens>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItKerberosTransportEndorsingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:TransportBinding>
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <sp:HttpsToken>
+ <wsp:Policy/>
+ </sp:HttpsToken>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax />
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp />
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128 />
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ <sp:EndorsingSupportingTokens>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:EndorsingSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItKerberosAsymmetricEndorsingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireIssuerSerialReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireIssuerSerialReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:EndorsingSupportingTokens>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:EndorsingSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItKerberosSymmetricProtectionPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItKerberosSymmetricDerivedProtectionPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ <sp:RequireDerivedKeys />
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItKerberosAsymmetricSignedEndorsingPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireIssuerSerialReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireIssuerSerialReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:SignedEndorsingSupportingTokens>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:SignedEndorsingSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItKerberosAsymmetricSignedEncryptedPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al...">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireIssuerSerialReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireIssuerSerialReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:SignedEncryptedSupportingTokens>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:SignedEncryptedSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="DoubleItKerberosSymmetricEndorsingEncryptedPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireThumbprintReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:EndorsingEncryptedSupportingTokens>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:EndorsingEncryptedSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="DoubleItKerberosSymmetricSignedEndorsingEncryptedPolicy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10 />
+ <sp:RequireThumbprintReference />
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:SignedEndorsingEncryptedSupportingTokens>
+ <wsp:Policy>
+ <sp:KerberosToken
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Once">
+ <wsp:Policy>
+ <sp:WssGssKerberosV5ApReqToken11/>
+ </wsp:Policy>
+ </sp:KerberosToken>
+ </wsp:Policy>
+ </sp:SignedEndorsingEncryptedSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Input_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+ <wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Output_Policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedParts>
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+</wsdl:definitions>
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItLogical.wsdl
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItLogical.wsdl (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItLogical.wsdl 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,108 @@
+<!--
+ 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="DoubleIt"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:di="http://www.example.org/schema/DoubleIt"
+ xmlns:tns="http://www.example.org/contract/DoubleIt" xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
+ xmlns:t="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsaw="http://www.w3.org/2005/08/addressing"
+ xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" targetNamespace="http://www.example.org/contract/DoubleIt">
+ <!-- Replaced for wsp: http://schemas.xmlsoap.org/ws/2004/09/policy -->
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://www.example.org/schema/DoubleIt">
+ <xsd:element name="DoubleIt">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="numberToDouble" type="xsd:int" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="DoubleIt2">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="numberToDouble" type="xsd:int" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="DoubleItResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="doubledNumber" type="xsd:int" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="DoubleItHeader" type="xsd:int"/>
+ <xsd:element name="DoubleItFault">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="minor" type="xsd:short"/>
+ <xsd:element name="major" type="xsd:short"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="DoubleItRequest">
+ <wsdl:part element="di:DoubleIt" name="parameters" />
+ </wsdl:message>
+ <wsdl:message name="DoubleIt2Request">
+ <wsdl:part element="di:DoubleIt2" name="parameters" />
+ </wsdl:message>
+ <wsdl:message name="DoubleItRequestHeader">
+ <wsdl:part element="di:DoubleIt" name="parameters" />
+ <wsdl:part element="di:DoubleItHeader" name="header" />
+ </wsdl:message>
+ <wsdl:message name="DoubleItResponse">
+ <wsdl:part element="di:DoubleItResponse" name="parameters" />
+ </wsdl:message>
+ <wsdl:message name="DoubleIt2Response">
+ <wsdl:part element="di:DoubleItResponse" name="parameters" />
+ </wsdl:message>
+ <wsdl:message name="DoubleItFault">
+ <wsdl:part element="di:DoubleItFault" name="DoubleItFault" />
+ </wsdl:message>
+ <wsdl:portType name="DoubleItPortType">
+ <wsdl:operation name="DoubleIt">
+ <wsdl:input message="tns:DoubleItRequest" />
+ <wsdl:output message="tns:DoubleItResponse" />
+ <wsdl:fault message="tns:DoubleItFault" name="DoubleItFault" />
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:portType name="DoubleItPortTypeHeader">
+ <wsdl:operation name="DoubleIt">
+ <wsdl:input message="tns:DoubleItRequestHeader" />
+ <wsdl:output message="tns:DoubleItResponse" />
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:portType name="DoubleItPortType2">
+ <wsdl:operation name="DoubleIt">
+ <wsdl:input message="tns:DoubleItRequest" />
+ <wsdl:output message="tns:DoubleItResponse" />
+ <wsdl:fault message="tns:DoubleItFault" name="DoubleItFault" />
+ </wsdl:operation>
+ <wsdl:operation name="DoubleIt2">
+ <wsdl:input message="tns:DoubleIt2Request" />
+ <wsdl:output message="tns:DoubleIt2Response" />
+ </wsdl:operation>
+ </wsdl:portType>
+
+
+</wsdl:definitions>
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItLogical.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/cxf.xml
===================================================================
--- stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/cxf.xml (rev 0)
+++ stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/cxf.xml 2013-05-03 07:03:22 UTC (rev 17530)
@@ -0,0 +1,21 @@
+<beans xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xsi:schemaLocation='http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/policy
+ http://cxf.apache.org/schemas/policy.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging/>
+ <p:policies/>
+ </cxf:features>
+ </cxf:bus>
+ </beans>
\ No newline at end of file
Property changes on: stack/cxf/branches/kerberos-test/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/cxf.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
11 years, 8 months
- 1
- 0
JBossWS SVN: r17529 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-05-03 02:46:21 -0400 (Fri, 03 May 2013)
New Revision: 17529
Added:
stack/cxf/branches/kerberos-test/
Log:
Create workspace for wss kerberos token test
11 years, 8 months
- 1
- 0
JBossWS SVN: r17528 - in stack/cxf/trunk/modules: resources/src/main/resources/modules/jboss710/org and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-05-02 16:27:08 -0400 (Thu, 02 May 2013)
New Revision: 17528
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/main/module.xml
Modified:
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-3629] Add wstx 4.2.0 to bin dist and install it on AS 7
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-05-02 15:16:42 UTC (rev 17527)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-05-02 20:27:08 UTC (rev 17528)
@@ -59,6 +59,8 @@
<include>jboss.jaxbintros:jboss-jaxb-intros</include>
<include>javax.xml.stream:stax-api:jar</include>
<include>javax.jws:jsr181-api:jar</include>
+ <include>org.codehaus.woodstox:stax2-api:jar</include>
+ <include>org.codehaus.woodstox:woodstox-core-asl:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<useProjectArtifact>false</useProjectArtifact>
Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/codehaus/woodstox/main/module.xml 2013-05-02 20:27:08 UTC (rev 17528)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+<module xmlns="urn:jboss:module:1.1" name="org.codehaus.woodstox">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.xml.stream.api"/>
+ <module name="javax.api"/>
+ </dependencies>
+</module>
\ No newline at end of file
Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/main/module.xml (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/codehaus/woodstox/main/module.xml 2013-05-02 20:27:08 UTC (rev 17528)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., 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.
+ -->
+<module xmlns="urn:jboss:module:1.1" name="org.codehaus.woodstox">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.xml.stream.api"/>
+ <module name="javax.api"/>
+ </dependencies>
+</module>
\ No newline at end of file
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-05-02 15:16:42 UTC (rev 17527)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-05-02 20:27:08 UTC (rev 17528)
@@ -235,6 +235,12 @@
<include name="**/xmltooling.jar"/>
</fileset>
</copy>
+ <copy todir="@{targetdir}/org/codehaus/woodstox/main" flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/woodstox-core-asl.jar"/>
+ <include name="**/stax2-api.jar"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossws-cxf-resources-(a){jbossid}.jar"/>
11 years, 8 months
- 1
- 0
JBossWS SVN: r17527 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-05-02 11:16:42 -0400 (Thu, 02 May 2013)
New Revision: 17527
Modified:
stack/cxf/trunk/pom.xml
Log:
Move to cxf 2.7.5-SNAPSHOT
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-04-30 12:59:22 UTC (rev 17526)
+++ stack/cxf/trunk/pom.xml 2013-05-02 15:16:42 UTC (rev 17527)
@@ -73,7 +73,7 @@
<jboss720.version>7.2.0.Final</jboss720.version>
<wildfly800.version>8.0.0.Alpha1-SNAPSHOT</wildfly800.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.7.4</cxf.version>
+ <cxf.version>2.7.5-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.6.0</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
11 years, 8 months
- 1
- 0