JBossWS SVN: r16317 - in stack/cxf/trunk/modules: server and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-05-25 10:40:23 -0400 (Fri, 25 May 2012)
New Revision: 16317
Added:
stack/cxf/trunk/modules/server/src/test/
stack/cxf/trunk/modules/server/src/test/java/
stack/cxf/trunk/modules/server/src/test/java/org/
stack/cxf/trunk/modules/server/src/test/java/org/jboss/
stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/
stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/
stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/
stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/
stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
Log:
[JBWS-3504] Adding option for setting policy alternative selector on server side
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 2012-05-25 09:36:59 UTC (rev 16316)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java 2012-05-25 14:40:23 UTC (rev 16317)
@@ -39,4 +39,5 @@
public static final String CXF_QUEUE_HIGH_WATER_MARK_PROP = "highWaterMark";
public static final String CXF_QUEUE_LOW_WATER_MARK_PROP = "lowWaterMark";
public static final String CXF_QUEUE_DEQUEUE_TIMEOUT_PROP = "dequeueTimeout";
+ public static final String CXF_POLICY_ALTERNATIVE_SELECTOR = "cxf.policy.alternativeSelector";
}
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2012-05-25 09:36:59 UTC (rev 16316)
+++ stack/cxf/trunk/modules/server/pom.xml 2012-05-25 14:40:23 UTC (rev 16317)
@@ -215,7 +215,7 @@
<artifactId>xercesImpl</artifactId>
</dependency>
- <!-- transitve dependencies -->
+ <!-- transitive dependencies -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
@@ -253,6 +253,12 @@
<artifactId>juddi-service</artifactId>
<type>sar</type>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Plugins -->
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 2012-05-25 09:36:59 UTC (rev 16316)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-05-25 14:40:23 UTC (rev 16317)
@@ -36,6 +36,7 @@
import org.apache.cxf.workqueue.AutomaticWorkQueue;
import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
import org.apache.cxf.workqueue.WorkQueueManager;
+import org.apache.cxf.ws.policy.AlternativeSelector;
import org.apache.cxf.ws.policy.PolicyEngine;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
import org.jboss.ws.api.binding.BindingCustomization;
@@ -95,16 +96,14 @@
setSoapTransportFactory(bus, soapTransportFactory);
setResourceResolver(bus, resolver);
- //set MaximalAlternativeSelector on server side [JBWS-3149]
+ Map<String, String> props = getJBossWebservicesMetaDataProperties(dep);
+
if (bus.getExtension(PolicyEngine.class) != null)
{
- bus.getExtension(PolicyEngine.class).setAlternativeSelector(new MaximalAlternativeSelector());
+ bus.getExtension(PolicyEngine.class).setAlternativeSelector(getAlternativeSelector(props));
}
- if (dep != null)
- {
- setAdditionalWorkQueues(bus, dep.getAttachment(JBossWebservicesMetaData.class));
- }
+ setAdditionalWorkQueues(bus, props);
}
@@ -172,36 +171,60 @@
* @param bus
* @param wsmd
*/
- protected static void setAdditionalWorkQueues(Bus bus, JBossWebservicesMetaData wsmd)
+ protected static void setAdditionalWorkQueues(Bus bus, Map<String, String> props)
{
- if (wsmd != null) {
- Map<String, String> props = wsmd.getProperties();
- if (props != null && !props.isEmpty()) {
- Map<String, Map<String, String>> queuesMap = new HashMap<String, Map<String,String>>();
- for (final String k : props.keySet()) {
- if (k.startsWith(Constants.CXF_QUEUE_PREFIX)) {
- String sk = k.substring(Constants.CXF_QUEUE_PREFIX.length());
- int i = sk.indexOf(".");
- if (i > 0) {
- String queueName = sk.substring(0, i);
- String queueProp = sk.substring(i+1);
- Map<String, String> m = queuesMap.get(queueName);
- if (m == null) {
- m = new HashMap<String, String>();
- queuesMap.put(queueName, m);
- }
- m.put(queueProp, props.get(k));
+ if (props != null && !props.isEmpty()) {
+ Map<String, Map<String, String>> queuesMap = new HashMap<String, Map<String,String>>();
+ for (final String k : props.keySet()) {
+ if (k.startsWith(Constants.CXF_QUEUE_PREFIX)) {
+ String sk = k.substring(Constants.CXF_QUEUE_PREFIX.length());
+ int i = sk.indexOf(".");
+ if (i > 0) {
+ String queueName = sk.substring(0, i);
+ String queueProp = sk.substring(i+1);
+ Map<String, String> m = queuesMap.get(queueName);
+ if (m == null) {
+ m = new HashMap<String, String>();
+ queuesMap.put(queueName, m);
}
+ m.put(queueProp, props.get(k));
}
}
- WorkQueueManager mgr = bus.getExtension(WorkQueueManager.class);
- for (String queueName : queuesMap.keySet()) {
- AutomaticWorkQueue q = createWorkQueue(queueName, queuesMap.get(queueName));
- mgr.addNamedWorkQueue(queueName, q);
+ }
+ WorkQueueManager mgr = bus.getExtension(WorkQueueManager.class);
+ for (String queueName : queuesMap.keySet()) {
+ AutomaticWorkQueue q = createWorkQueue(queueName, queuesMap.get(queueName));
+ mgr.addNamedWorkQueue(queueName, q);
+ }
+ }
+ }
+
+ private static AlternativeSelector getAlternativeSelector(Map<String, String> props) {
+ //default to MaximalAlternativeSelector on server side [JBWS-3149]
+ AlternativeSelector selector = new MaximalAlternativeSelector();
+ if (props != null && !props.isEmpty()) {
+ String className = props.get(Constants.CXF_POLICY_ALTERNATIVE_SELECTOR);
+ if (className != null) {
+ try {
+ Class<?> clazz = Class.forName(className);
+ selector = (AlternativeSelector)clazz.newInstance();
+ } catch (Exception e) {
+
}
}
}
+ return selector;
}
+
+ private static Map<String, String> getJBossWebservicesMetaDataProperties(Deployment dep) {
+ if (dep != null) {
+ JBossWebservicesMetaData wsmd = dep.getAttachment(JBossWebservicesMetaData.class);
+ if (wsmd != null) {
+ return wsmd.getProperties();
+ }
+ }
+ return null;
+ }
private static AutomaticWorkQueue createWorkQueue(String name, Map<String, String> props) {
int mqs = parseInt(props.get(Constants.CXF_QUEUE_MAX_QUEUE_SIZE_PROP), 256);
Added: stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java
===================================================================
--- stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java (rev 0)
+++ stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2012-05-25 14:40:23 UTC (rev 16317)
@@ -0,0 +1,150 @@
+/*
+ * 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.wsf.stack.cxf.configuration;
+
+import junit.framework.TestCase;
+
+import org.apache.cxf.ws.policy.PolicyEngine;
+import org.apache.cxf.ws.policy.selector.FirstAlternativeSelector;
+import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentState;
+import org.jboss.wsf.spi.deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+import org.jboss.wsf.stack.cxf.client.Constants;
+import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
+
+
+/**
+ * A test case for BusHolder
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 24-Feb-2011
+ *
+ */
+public class BusHolderTest extends TestCase
+{
+ public void testFirstAlternativeSelector()
+ {
+ final String alternative = FirstAlternativeSelector.class.getName();
+ assertEquals(alternative, setupPropertyAndGetAlternativeSelector(alternative));
+ }
+
+ public void testInvalidAlternativeSelector()
+ {
+ assertEquals(MaximalAlternativeSelector.class.getName(), setupPropertyAndGetAlternativeSelector("org.jboss.ws.MyInvalidAlternative"));
+ }
+
+ public void testDefaultAlternativeSelector()
+ {
+ assertEquals(MaximalAlternativeSelector.class.getName(), setupPropertyAndGetAlternativeSelector(null));
+ }
+
+ private static String setupPropertyAndGetAlternativeSelector(String alternative) {
+ Deployment dep = new TestDeployment();
+ if (alternative != null) {
+ JBossWebservicesMetaData wsmd = new JBossWebservicesMetaData(null);
+ wsmd.setProperty(Constants.CXF_POLICY_ALTERNATIVE_SELECTOR, alternative);
+ dep.addAttachment(JBossWebservicesMetaData.class, wsmd);
+ }
+ BusHolder holder = new NonSpringBusHolder(new DDBeans());
+ try {
+ holder.configure(null, null, null, dep);
+ return holder.getBus().getExtension(PolicyEngine.class).getAlternativeSelector().getClass().getName();
+ } finally {
+ holder.close();
+ }
+ }
+
+ private static class TestDeployment extends AbstractExtensible implements Deployment {
+
+ @Override
+ public String getSimpleName()
+ {
+ return null;
+ }
+
+ @Override
+ public void setSimpleName(String name)
+ {
+ }
+
+ @Override
+ public ClassLoader getInitialClassLoader()
+ {
+ return null;
+ }
+
+ @Override
+ public void setInitialClassLoader(ClassLoader loader)
+ {
+ }
+
+ @Override
+ public ClassLoader getRuntimeClassLoader()
+ {
+ return null;
+ }
+
+ @Override
+ public void setRuntimeClassLoader(ClassLoader loader)
+ {
+ }
+
+ @Override
+ public DeploymentType getType()
+ {
+ return null;
+ }
+
+ @Override
+ public void setType(DeploymentType type)
+ {
+ }
+
+ @Override
+ public DeploymentState getState()
+ {
+ return null;
+ }
+
+ @Override
+ public void setState(DeploymentState type)
+ {
+ }
+
+ @Override
+ public Service getService()
+ {
+ return null;
+ }
+
+ @Override
+ public void setService(Service service)
+ {
+ }
+
+ }
+
+}
12 years, 7 months
- 1
- 0
JBossWS SVN: r16316 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2012-05-25 05:36:59 -0400 (Fri, 25 May 2012)
New Revision: 16316
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Temporarily exclude JBWS1666TestCase
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-05-24 16:58:38 UTC (rev 16315)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-05-25 09:36:59 UTC (rev 16316)
@@ -762,6 +762,9 @@
<!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
<exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
+
+ <!--# [JBWS-3503] Enable this after find out how to easily generate client classpath in as7-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1666/**</exclude>
<!--# [JBWS-2561] XOP request not properly inlined-->
<exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
12 years, 7 months
- 1
- 0
JBossWS SVN: r16315 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-05-24 12:58:38 -0400 (Thu, 24 May 2012)
New Revision: 16315
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java
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/NonSpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
Log:
[JBWS-3497] Allow configuring cxf work queues using properties from jboss-webservices.xml
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 2012-05-24 16:32:55 UTC (rev 16314)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java 2012-05-24 16:58:38 UTC (rev 16315)
@@ -32,4 +32,11 @@
{
public static final String DEPLOYMENT_BUS = "deployment-bus";
public static final String JBOSSWS_CXF_SPRING_DD = "jbossws-cxf.xml";
+
+ public static final String CXF_QUEUE_PREFIX = "cxf.queue.";
+ public static final String CXF_QUEUE_MAX_QUEUE_SIZE_PROP = "maxQueueSize";
+ public static final String CXF_QUEUE_INITIAL_THREADS_PROP = "initialThreads";
+ public static final String CXF_QUEUE_HIGH_WATER_MARK_PROP = "highWaterMark";
+ public static final String CXF_QUEUE_LOW_WATER_MARK_PROP = "lowWaterMark";
+ public static final String CXF_QUEUE_DEQUEUE_TIMEOUT_PROP = "dequeueTimeout";
}
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 2012-05-24 16:32:55 UTC (rev 16314)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-05-24 16:58:38 UTC (rev 16315)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * 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.
*
@@ -21,7 +21,9 @@
*/
package org.jboss.wsf.stack.cxf.configuration;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapTransportFactory;
@@ -31,12 +33,17 @@
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.workqueue.AutomaticWorkQueue;
+import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
+import org.apache.cxf.workqueue.WorkQueueManager;
import org.apache.cxf.ws.policy.PolicyEngine;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
import org.jboss.ws.api.binding.BindingCustomization;
-import org.jboss.ws.common.Constants;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+import org.jboss.wsf.stack.cxf.client.Constants;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
import org.jboss.wsf.stack.cxf.interceptor.EnableOneWayDecoupledFaultInterceptor;
import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor;
@@ -72,8 +79,9 @@
* @param soapTransportFactory The SoapTransportFactory to configure, if any
* @param resolver The ResourceResolver to configure, if any
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
+ * @param dep The current JBossWS-SPI Deployment
*/
- public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer)
+ public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, Deployment dep)
{
bus.setProperty(org.jboss.wsf.stack.cxf.client.Constants.DEPLOYMENT_BUS, true);
busHolderListener = new BusHolderLifeCycleListener();
@@ -92,6 +100,11 @@
{
bus.getExtension(PolicyEngine.class).setAlternativeSelector(new MaximalAlternativeSelector());
}
+
+ if (dep != null)
+ {
+ setAdditionalWorkQueues(bus, dep.getAttachment(JBossWebservicesMetaData.class));
+ }
}
@@ -143,11 +156,70 @@
{
DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
factory.setBus(bus);
- dfm.registerDestinationFactory(Constants.NS_SOAP11, factory);
- dfm.registerDestinationFactory(Constants.NS_SOAP12, factory);
+ dfm.registerDestinationFactory(org.jboss.ws.common.Constants.NS_SOAP11, factory);
+ dfm.registerDestinationFactory(org.jboss.ws.common.Constants.NS_SOAP12, factory);
}
}
+
+ /**
+ * Adds work queues parsing simple values of properties in jboss-webservices.xml:
+ * cxf.queue.<queue-name>.<parameter> = value
+ * e.g.
+ * cxf.queue.default.maxQueueSize = 500
+ *
+ * See constants in {@link org.jboss.wsf.stack.cxf.client.Constants}.
+ *
+ * @param bus
+ * @param wsmd
+ */
+ protected static void setAdditionalWorkQueues(Bus bus, JBossWebservicesMetaData wsmd)
+ {
+ if (wsmd != null) {
+ Map<String, String> props = wsmd.getProperties();
+ if (props != null && !props.isEmpty()) {
+ Map<String, Map<String, String>> queuesMap = new HashMap<String, Map<String,String>>();
+ for (final String k : props.keySet()) {
+ if (k.startsWith(Constants.CXF_QUEUE_PREFIX)) {
+ String sk = k.substring(Constants.CXF_QUEUE_PREFIX.length());
+ int i = sk.indexOf(".");
+ if (i > 0) {
+ String queueName = sk.substring(0, i);
+ String queueProp = sk.substring(i+1);
+ Map<String, String> m = queuesMap.get(queueName);
+ if (m == null) {
+ m = new HashMap<String, String>();
+ queuesMap.put(queueName, m);
+ }
+ m.put(queueProp, props.get(k));
+ }
+ }
+ }
+ WorkQueueManager mgr = bus.getExtension(WorkQueueManager.class);
+ for (String queueName : queuesMap.keySet()) {
+ AutomaticWorkQueue q = createWorkQueue(queueName, queuesMap.get(queueName));
+ mgr.addNamedWorkQueue(queueName, q);
+ }
+ }
+ }
+ }
+ private static AutomaticWorkQueue createWorkQueue(String name, Map<String, String> props) {
+ int mqs = parseInt(props.get(Constants.CXF_QUEUE_MAX_QUEUE_SIZE_PROP), 256);
+ int initialThreads = parseInt(props.get(Constants.CXF_QUEUE_INITIAL_THREADS_PROP), 0);
+ int highWaterMark = parseInt(props.get(Constants.CXF_QUEUE_HIGH_WATER_MARK_PROP), 25);
+ int lowWaterMark = parseInt(props.get(Constants.CXF_QUEUE_LOW_WATER_MARK_PROP), 5);
+ long dequeueTimeout = parseLong(props.get(Constants.CXF_QUEUE_DEQUEUE_TIMEOUT_PROP), 2 * 60 * 1000L);
+ return new AutomaticWorkQueueImpl(mqs, initialThreads, highWaterMark, lowWaterMark, dequeueTimeout, name);
+ }
+
+ private static int parseInt(String prop, int defaultValue) {
+ return prop != null ? Integer.parseInt(prop) : defaultValue;
+ }
+
+ private static long parseLong(String prop, long defaultValue) {
+ return prop != null ? Long.parseLong(prop) : defaultValue;
+ }
+
/**
* Return the hold bus
*
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-05-24 16:32:55 UTC (rev 16314)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-05-24 16:58:38 UTC (rev 16315)
@@ -40,6 +40,7 @@
import org.apache.cxf.ws.rm.RMManager;
import org.jboss.ws.api.binding.BindingCustomization;
import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringBusFactory;
@@ -83,13 +84,13 @@
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
*/
@Override
- public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer)
+ public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, Deployment dep)
{
if (configured)
{
throw new IllegalStateException(BundleUtils.getMessage(bundle, "BUS_IS_ALREADY_CONFIGURED"));
}
- super.configure(soapTransportFactory, resolver, configurer);
+ super.configure(soapTransportFactory, resolver, configurer, dep);
for (DDEndpoint dde : metadata.getEndpoints())
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-24 16:32:55 UTC (rev 16314)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-24 16:58:38 UTC (rev 16315)
@@ -41,6 +41,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.api.binding.BindingCustomization;
import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory;
@@ -121,15 +122,16 @@
* @param soapTransportFactory The SoapTransportFactory to configure, if any
* @param resolver The ResourceResolver to configure, if any
* @param configurer The JBossWSCXFConfigurer to install in the bus, if any
+ * @param dep The current JBossWS-SPI Deployment
*/
@Override
- public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer)
+ public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, Deployment dep)
{
if (configured)
{
throw new IllegalStateException(BundleUtils.getMessage(bundle, "BUS_IS_ALREADY_CONFIGURED"));
}
- super.configure(soapTransportFactory, resolver, configurer);
+ super.configure(soapTransportFactory, resolver, configurer, dep);
if (additionalLocations != null)
{
for (URL jbossCxfXml : additionalLocations)
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-05-24 16:32:55 UTC (rev 16314)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-05-24 16:58:38 UTC (rev 16315)
@@ -110,7 +110,7 @@
}
Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile());
- holder.configure(new SoapTransportFactoryExt(), resolver, configurer);
+ holder.configure(new SoapTransportFactoryExt(), resolver, configurer, dep);
dep.addAttachment(BusHolder.class, holder);
}
finally
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 2012-05-24 16:32:55 UTC (rev 16314)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2012-05-24 16:58:38 UTC (rev 16315)
@@ -194,6 +194,19 @@
</classes>
</war>
+ <!-- jaxws-cxf-jbws3497 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3497.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3497/Endpoint*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3497/META-INF">
+ <include name="**/*" />
+ </metainf>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.cxf"/>
+ </manifest>
+ </jar>
+
<!-- jaxws-cxf-logging -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar">
<fileset dir="${tests.output.dir}/test-classes">
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2012-05-24 16:32:55 UTC (rev 16314)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2012-05-24 16:58:38 UTC (rev 16315)
@@ -63,7 +63,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null);
+ holder.configure(null, null, null, null);
holder.close();
assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
+ listener.getCount(), 1, listener.getCount());
@@ -74,7 +74,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null);
+ holder.configure(null, null, null, null);
bus.shutdown(true);
holder.close();
assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
@@ -86,7 +86,7 @@
Bus bus = holder.getBus();
TestLifeCycleListener listener = new TestLifeCycleListener();
bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
- holder.configure(null, null, null);
+ holder.configure(null, null, null, null);
assertEquals("preShutdown method on listener shouldn't be called before holder is closed: number of actual calls: "
+ listener.getCount(), 0, listener.getCount());
holder.close();
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOne.java 2012-05-24 16:58:38 UTC (rev 16315)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3497;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3497", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointOne
+{
+ String echo(String input);
+
+ @Oneway
+ void echoOneWay(String input);
+
+ int getCount();
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/EndpointOneImpl.java 2012-05-24 16:58:38 UTC (rev 16315)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.jbws3497;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.ejb.Stateless;
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.workqueue.AutomaticWorkQueue;
+import org.apache.cxf.workqueue.WorkQueueManager;
+import org.jboss.logging.Logger;
+
+@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3497", serviceName = "ServiceOne")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Stateless
+public class EndpointOneImpl
+{
+ private static AtomicInteger count = new AtomicInteger(0);
+
+ @WebMethod
+ public String echo(String input)
+ {
+ Bus bus = BusFactory.getThreadDefaultBus(false);
+ AutomaticWorkQueue queue = bus.getExtension(WorkQueueManager.class).getAutomaticWorkQueue();
+ //this is just a verification, so going the dirty way...
+ Long qs = null;
+ Integer it = null;
+ try
+ {
+ qs = (Long) queue.getClass().getMethod("getMaxSize").invoke(queue);
+ it = (Integer) queue.getClass().getMethod("getHighWaterMark").invoke(queue);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ if (qs != 10)
+ {
+ throw new RuntimeException("Expected max queue size '10' but got '" + qs + "'!");
+ }
+ if (it != 8)
+ {
+ throw new RuntimeException("Expected highWaterMark '8' but got '" + it + "'!");
+ }
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ count.incrementAndGet();
+ return input;
+ }
+
+ @WebMethod
+ @Oneway
+ public void echoOneWay(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echoOneWay: " + input);
+ count.incrementAndGet();
+ }
+
+ @WebMethod
+ public int getCount()
+ {
+ return count.get();
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3497/JBWS3497TestCase.java 2012-05-24 16:58:38 UTC (rev 16315)
@@ -0,0 +1,138 @@
+/*
+ * 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.jbws3497;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-3497] Add ability to configure the queue depth on the asynchronous (@Oneway) work queue.
+ *
+ * @author alessio.soldano(a)jboss.com
+ *
+ */
+public class JBWS3497TestCase extends JBossWSTest
+{
+ private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3497/ServiceOne/EndpointOne";
+ private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3497";
+
+ private EndpointOne portOne;
+
+ protected int defaultSize = 200;
+
+
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(JBWS3497TestCase.class, "jaxws-cxf-jbws3497.jar");
+ }
+
+ public void testAccess() throws Exception
+ {
+ initPorts();
+ int count1 = portOne.getCount();
+ Object retObj = portOne.echo("Hello");
+ assertEquals("Hello", retObj);
+ assertEquals(1, portOne.getCount() - count1);
+ }
+
+ //Disabled as there's no easy way for knowing the server is logging WARN messages saying the @OneWay processing queue is full.
+ //Manually enable this test if willing to check (and try modifying 'cxf.queue.default.maxQueueSize' prop value in jboss-webservices.xml);
+ //otherwise the EndpointOne implementation simply checks the related AutomaticWorkQueue is properly configured.
+ public void _testConcurrentOneWayInvocations() throws Exception
+ {
+ runConcurrentTests(true);
+ }
+
+ private void runConcurrentTests(boolean oneway) throws Exception
+ {
+ initPorts();
+ final int size = defaultSize;
+ int count1 = portOne.getCount();
+ ExecutorService es = Executors.newFixedThreadPool(size);
+ List<Callable<Boolean>> callables = new ArrayList<Callable<Boolean>>(size*3);
+ for (int i = 0; i < size*3; i++)
+ {
+ callables.add(new CallableOne(portOne, oneway, i));
+ }
+ List<Future<Boolean>> futures = es.invokeAll(callables);
+ for (Future<Boolean> f : futures)
+ {
+ assertTrue(f.get());
+ }
+ if (oneway) {
+ Thread.sleep(3000);
+ }
+ assertEquals(size*3, portOne.getCount() - count1);
+ }
+
+ private void initPorts() throws MalformedURLException
+ {
+ URL wsdlOneURL = new URL(endpointOneURL + "?wsdl");
+ QName serviceOneName = new QName(targetNS, "ServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class);
+ }
+
+ private static class CallableOne implements Callable<Boolean>
+ {
+ private EndpointOne port;
+ private boolean oneway;
+ private int seqNum;
+
+ public CallableOne(EndpointOne port, boolean oneway, int seqNum)
+ {
+ this.port = port;
+ this.oneway = oneway;
+ this.seqNum = seqNum;
+ }
+
+ public Boolean call() throws Exception
+ {
+ String arg = "Foo" + seqNum;
+ if (oneway)
+ {
+ port.echoOneWay(arg);
+ return true;
+ }
+ else
+ {
+ String result = port.echo(arg);
+ return arg.equals(result);
+ }
+ }
+ }
+
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3497/META-INF/jboss-webservices.xml 2012-05-24 16:58:38 UTC (rev 16315)
@@ -0,0 +1,17 @@
+<?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.queue.default.maxQueueSize</name>
+ <value>10</value>
+ </property>
+ <property>
+ <name>cxf.queue.default.highWaterMark</name>
+ <value>8</value>
+ </property>
+
+</webservices>
\ No newline at end of file
12 years, 7 months
- 1
- 0
JBossWS SVN: r16314 - in spi/trunk/src/main: java/org/jboss/wsf/spi/metadata/webservices and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-05-24 12:32:55 -0400 (Thu, 24 May 2012)
New Revision: 16314
Added:
spi/trunk/src/main/resources/schema/jboss_web_services_1.2.xsd
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java
Log:
[JBWS-3502] Adding property element into jboss-webservices.xml DD, fixing parser and metadata
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2012-05-24 13:36:23 UTC (rev 16313)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2012-05-24 16:32:55 UTC (rev 16314)
@@ -143,6 +143,10 @@
public static final String PROPERTY_VALUE = "property-value";
+ public static final String NAME = "name";
+
+ public static final String VALUE = "value";
+
public static final String SECURE_WSDL_ACCESS = "secure-wsdl-access";
public static final String TRANSPORT_GUARANTEE = "transport-guarantee";
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2012-05-24 13:36:23 UTC (rev 16313)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2012-05-24 16:32:55 UTC (rev 16314)
@@ -33,6 +33,9 @@
import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT;
import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_NAME;
import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_URI;
+import static org.jboss.wsf.spi.metadata.ParserConstants.PROPERTY;
+import static org.jboss.wsf.spi.metadata.ParserConstants.NAME;
+import static org.jboss.wsf.spi.metadata.ParserConstants.VALUE;
import static org.jboss.wsf.spi.metadata.ParserConstants.SECURE_WSDL_ACCESS;
import static org.jboss.wsf.spi.metadata.ParserConstants.TRANSPORT_GUARANTEE;
import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICES;
@@ -59,6 +62,7 @@
/**
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
*/
public class JBossWebservicesFactory {
@@ -192,6 +196,8 @@
metadata.setConfigName(elementAsString(reader));
} else if (match(reader, nsUri, CONFIG_FILE)) {
metadata.setConfigFile(elementAsString(reader));
+ } else if (match(reader, nsUri, PROPERTY)) {
+ parseProperty(reader, nsUri, metadata);
} else if (match(reader, nsUri, PORT_COMPONENT)) {
metadata.addPortComponent(parsePortComponent(reader, nsUri));
} else if (match(reader, nsUri, WEBSERVICE_DESCRIPTION)) {
@@ -268,5 +274,45 @@
}
throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY"));
}
+
+ private void parseProperty(XMLStreamReader reader, String nsUri, JBossWebservicesMetaData metadata) throws XMLStreamException
+ {
+ String name = null;
+ String value = null;
+ while (reader.hasNext())
+ {
+ switch (reader.nextTag())
+ {
+ case XMLStreamConstants.END_ELEMENT : {
+ if (match(reader, nsUri, PROPERTY))
+ {
+ if (name == null)
+ {
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "COULD_NOT_GET_PROPERTY_NAME"));
+ }
+ metadata.setProperty(name, value);
+ return;
+ }
+ else
+ {
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_END_TAG", reader.getLocalName()));
+ }
+ }
+ case XMLStreamConstants.START_ELEMENT : {
+ if (match(reader, nsUri, NAME)) {
+ name = elementAsString(reader);
+ }
+ else if (match(reader, nsUri, VALUE)) {
+ value = elementAsString(reader);
+ }
+ else
+ {
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", reader.getLocalName()));
+ }
+ }
+ }
+ }
+ throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY"));
+ }
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java 2012-05-24 13:36:23 UTC (rev 16313)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java 2012-05-24 16:32:55 UTC (rev 16314)
@@ -23,8 +23,10 @@
package org.jboss.wsf.spi.metadata.webservices;
import java.net.URL;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
/**
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
@@ -36,6 +38,8 @@
private String configName;
private String configFile;
+
+ private Map<String, String> properties = new HashMap<String, String>();
private List<JBossPortComponentMetaData> portComponents = new LinkedList<JBossPortComponentMetaData>();
@@ -94,5 +98,17 @@
webserviceDescriptions.toArray(array);
return array;
}
+
+ public void setProperty(String name, String value) {
+ properties.put(name, value);
+ }
+ public String getProperty(String name) {
+ return properties.get(name);
+ }
+
+ public Map<String, String> getProperties() {
+ return properties;
+ }
+
}
Added: spi/trunk/src/main/resources/schema/jboss_web_services_1.2.xsd
===================================================================
--- spi/trunk/src/main/resources/schema/jboss_web_services_1.2.xsd (rev 0)
+++ spi/trunk/src/main/resources/schema/jboss_web_services_1.2.xsd 2012-05-24 16:32:55 UTC (rev 16314)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+ targetNamespace="http://www.jboss.com/xml/ns/javaee"
+ xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.2">
+
+ <xsd:element name="webservices" type="jboss:webservicesType"/>
+
+ <xsd:complexType name="webservicesType">
+ <xsd:sequence>
+ <xsd:element name="context-root" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="config-name" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="config-file" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="property" type="jboss:webservicePropertyType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="port-component" type="jboss:portComponentType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="webservice-description" type="jboss:webserviceDescriptionType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="portComponentType">
+ <xsd:sequence>
+ <xsd:element name="ejb-name" type="xsd:token"/>
+ <xsd:element name="port-component-name" type="xsd:token"/>
+ <xsd:element name="port-component-uri" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="auth-method" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="transport-guarantee" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="secure-wsdl-access" type="xsd:boolean" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="webserviceDescriptionType">
+ <xsd:sequence>
+ <xsd:element name="webservice-description-name" type="xsd:token"/>
+ <xsd:element name="wsdl-publish-location" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="port-component" type="jboss:portComponentType" minOccurs="1" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="webservicePropertyType">
+ <xsd:sequence>
+ <xsd:element name="name" type="xsd:string"/>
+ <xsd:element name="value" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+</xsd:schema>
12 years, 7 months
- 1
- 0
JBossWS SVN: r16313 - in stack/cxf/trunk/modules/resources/src/main/resources/modules: jboss720/org/apache/cxf/main and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-05-24 09:36:23 -0400 (Thu, 24 May 2012)
New Revision: 16313
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml
Log:
[JBWS-3495] fix org.apache.cxf module definition for Apache CXF 2.6.x series
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-05-24 12:17:03 UTC (rev 16312)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-05-24 13:36:23 UTC (rev 16313)
@@ -36,10 +36,13 @@
</imports>
</module>
<module name="javax.api" />
+ <module name="javax.annotation.api" />
+ <module name="javax.mail.api" />
<module name="javax.wsdl4j.api" />
<module name="javax.xml.bind.api" services="import"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="org.apache.neethi" />
<module name="org.apache.ws.xmlschema" />
+ <module name="org.springframework.spring" optional="true" />
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2012-05-24 12:17:03 UTC (rev 16312)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2012-05-24 13:36:23 UTC (rev 16313)
@@ -36,10 +36,13 @@
</imports>
</module>
<module name="javax.api" />
+ <module name="javax.annotation.api" />
+ <module name="javax.mail.api" />
<module name="javax.wsdl4j.api" />
<module name="javax.xml.bind.api" services="import"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="org.apache.neethi" />
<module name="org.apache.ws.xmlschema" />
+ <module name="org.springframework.spring" optional="true" />
</dependencies>
</module>
12 years, 7 months
- 1
- 0
JBossWS SVN: r16312 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-05-24 08:17:03 -0400 (Thu, 24 May 2012)
New Revision: 16312
Removed:
stack/cxf/branches/ropalka/
Log:
removing working branch
12 years, 7 months
- 1
- 0
JBossWS SVN: r16311 - in stack/cxf/trunk: modules/client and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-05-24 08:15:01 -0400 (Thu, 24 May 2012)
New Revision: 16311
Modified:
stack/cxf/trunk/
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl
stack/cxf/trunk/pom.xml
Log:
[JBWS-3495] upgrade from Apache CXF 2.5.4-SNAPSHOT > 2.6.1-SNAPSHOT
Property changes on: stack/cxf/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2012-05-24 10:49:28 UTC (rev 16310)
+++ stack/cxf/trunk/modules/client/pom.xml 2012-05-24 12:15:01 UTC (rev 16311)
@@ -50,17 +50,12 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-coloc</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-05-24 10:49:28 UTC (rev 16310)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-05-24 12:15:01 UTC (rev 16311)
@@ -108,14 +108,12 @@
}
/** JBossWSNonSpringBusFactory methods **/
- @SuppressWarnings("rawtypes")
- public Bus createBus(Map<Class, Object> extensions)
+ public Bus createBus(Map<Class<?>, Object> extensions)
{
return getNonSpringBusFactory().createBus(extensions);
}
- @SuppressWarnings("rawtypes")
- public Bus createBus(Map<Class, Object> extensions, Map<String, Object> properties)
+ public Bus createBus(Map<Class<?>, Object> extensions, Map<String, Object> properties)
{
return getNonSpringBusFactory().createBus(extensions, properties);
}
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-05-24 10:49:28 UTC (rev 16310)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-05-24 12:15:01 UTC (rev 16311)
@@ -38,12 +38,11 @@
*/
public class JBossWSNonSpringBusFactory extends CXFBusFactory
{
- @SuppressWarnings("rawtypes")
@Override
- public Bus createBus(Map<Class, Object> extensions, Map<String, Object> properties) {
+ public Bus createBus(Map<Class<?>, Object> extensions, Map<String, Object> properties) {
if (extensions == null)
{
- extensions = new HashMap<Class, Object>();
+ extensions = new HashMap<Class<?>, Object>();
}
if (!extensions.containsKey(Configurer.class))
{
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-05-24 10:49:28 UTC (rev 16310)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSSpringBusFactory.java 2012-05-24 12:15:01 UTC (rev 16311)
@@ -118,7 +118,7 @@
return bus;
}
- private BusApplicationContext createApplicationContext(String cfgFiles[], boolean includeDefaults)
+ protected BusApplicationContext createApplicationContext(String cfgFiles[], boolean includeDefaults)
{
try
{
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2012-05-24 10:49:28 UTC (rev 16310)
+++ stack/cxf/trunk/modules/server/pom.xml 2012-05-24 12:15:01 UTC (rev 16311)
@@ -51,10 +51,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-24 10:49:28 UTC (rev 16310)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-24 12:15:01 UTC (rev 16311)
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.ResourceBundle;
@@ -31,6 +32,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapTransportFactory;
import org.apache.cxf.bus.spring.BusApplicationContext;
+import org.apache.cxf.configuration.ConfiguredBeanLocator;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.transport.http.HttpDestinationFactory;
@@ -67,6 +69,7 @@
protected BusApplicationContext ctx;
protected List<GenericApplicationContext> additionalCtx = new LinkedList<GenericApplicationContext>();
+ private ConfiguredBeanLocator delegatingBeanLocator;
protected URL[] additionalLocations;
@@ -90,13 +93,16 @@
//the cxf/jbossws-cxf check on actual need for spring bus (we know
//it's required here as we have the jbossws-cxf.xml descriptor)
bus = new JBossWSSpringBusFactory().createBus((URL[])null);
+ ConfiguredBeanLocator delegate = bus.getExtension(ConfiguredBeanLocator.class);
+ delegatingBeanLocator = new DelegatingBeanLocator(additionalCtx, delegate);
+ bus.setExtension(delegatingBeanLocator, ConfiguredBeanLocator.class);
ctx = bus.getExtension(BusApplicationContext.class);
//Load additional configurations from cxf-servlet.xml
if (location != null)
{
try
{
- additionalCtx.add(loadAdditionalConfig(ctx, location));
+ loadAdditionalConfig(ctx, location);
}
catch (IOException e)
{
@@ -130,7 +136,7 @@
{
try
{
- additionalCtx.add(loadAdditionalConfig(ctx, jbossCxfXml));
+ loadAdditionalConfig(ctx, jbossCxfXml);
}
catch (IOException e)
{
@@ -172,13 +178,14 @@
return serverConfigurer;
}
- protected static GenericApplicationContext loadAdditionalConfig(ApplicationContext ctx, URL locationUrl)
+ protected GenericApplicationContext loadAdditionalConfig(ApplicationContext ctx, URL locationUrl)
throws IOException
{
if (locationUrl == null)
throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_LOAD_ADDITIONAL_CONFIG"));
InputStream is = locationUrl.openStream();
GenericApplicationContext childCtx = new GenericApplicationContext(ctx);
+ additionalCtx.add(childCtx);
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx);
reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
reader.setNamespaceHandlerResolver(new NamespaceHandlerResolver(SecurityActions.getContextClassLoader()));
@@ -207,4 +214,51 @@
super.setBus(bus);
ctx = (bus.getExtension(BusApplicationContext.class));
}
+
+ private static class DelegatingBeanLocator implements ConfiguredBeanLocator {
+
+ private final ConfiguredBeanLocator delegate;
+ private final List<GenericApplicationContext> contexts;
+
+ private DelegatingBeanLocator(final List<GenericApplicationContext> contexts, final ConfiguredBeanLocator delegate) {
+ this.delegate = delegate;
+ this.contexts = contexts;
+ }
+
+ @Override
+ public List<String> getBeanNamesOfType(Class<?> arg0) {
+ return delegate.getBeanNamesOfType(arg0);
+ }
+
+ // TODO: hack for WSPolicyFeature local reference resolver :(
+ @Override
+ public <T> T getBeanOfType(String arg0, Class<T> arg1) {
+ for (final GenericApplicationContext ctx : contexts) {
+ if (ctx.containsBean(arg0)) {
+ return ctx.getBean(arg0, arg1);
+ }
+ }
+ return delegate.getBeanOfType(arg0, arg1);
+ }
+
+ @Override
+ public <T> Collection<? extends T> getBeansOfType(Class<T> arg0) {
+ return delegate.getBeansOfType(arg0);
+ }
+
+ @Override
+ public boolean hasBeanOfName(String arg0) {
+ return delegate.hasBeanOfName(arg0);
+ }
+
+ @Override
+ public boolean hasConfiguredPropertyValue(String arg0, String arg1, String arg2) {
+ return delegate.hasConfiguredPropertyValue(arg0, arg1, arg2);
+ }
+
+ @Override
+ public <T> boolean loadBeansOfType(Class<T> arg0, BeanLoaderListener<T> arg1) {
+ return delegate.loadBeansOfType(arg0, arg1);
+ }
+ }
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2012-05-24 10:49:28 UTC (rev 16310)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2012-05-24 12:15:01 UTC (rev 16311)
@@ -26,7 +26,7 @@
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
+import org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.management.ServerConfig;
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2012-05-24 10:49:28 UTC (rev 16310)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2012-05-24 12:15:01 UTC (rev 16311)
@@ -30,8 +30,8 @@
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
-import org.apache.cxf.tools.util.SOAPBindingUtil;
+import org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress;
+import org.apache.cxf.binding.soap.SOAPBindingUtil;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.management.ServerConfig;
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl 2012-05-24 10:49:28 UTC (rev 16310)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpproxy/HelloWorldService.wsdl 2012-05-24 12:15:01 UTC (rev 16311)
@@ -45,7 +45,7 @@
</wsdl:binding>
<wsdl:service name="HelloWorldService">
<wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort">
- <soap:address location="INVALID"/>
+ <soap:address location="http://unreachable-testHttpProxyUsingHTTPClientPolicy/jaxws-cxf-httpproxy..."/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-05-24 10:49:28 UTC (rev 16310)
+++ stack/cxf/trunk/pom.xml 2012-05-24 12:15:01 UTC (rev 16311)
@@ -73,7 +73,7 @@
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.5.4-SNAPSHOT</cxf.version>
+ <cxf.version>2.6.1-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
@@ -109,7 +109,7 @@
<xmlsec.version>1.5.1</xmlsec.version>
<wss4j.version>1.6.5</wss4j.version>
<wstx.version>3.2.9</wstx.version>
- <spring.version>3.0.6.RELEASE</spring.version>
+ <spring.version>3.0.7.RELEASE</spring.version>
</properties>
@@ -240,21 +240,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-http</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jra</groupId>
- <artifactId>jra</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
<version>${cxf.version}</version>
</dependency>
12 years, 7 months
- 1
- 0
JBossWS SVN: r16310 - stack/native/trunk/modules/core/src/main/resources/schema.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-05-24 06:49:28 -0400 (Thu, 24 May 2012)
New Revision: 16310
Removed:
stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_services_1.0.xsd
Log:
Moving schema for jboss-webservices.xml (jboss_web_services_1.0.xsd) to jbossws-spi
Deleted: stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_services_1.0.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_services_1.0.xsd 2012-05-24 10:48:57 UTC (rev 16309)
+++ stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_services_1.0.xsd 2012-05-24 10:49:28 UTC (rev 16310)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
- targetNamespace="http://www.jboss.com/xml/ns/javaee"
- xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.1">
-
- <xsd:element name="webservices" type="jboss:webservicesType"/>
-
- <xsd:complexType name="webservicesType">
- <xsd:sequence>
- <xsd:element name="context-root" type="xsd:token" minOccurs="0"/>
- <xsd:element name="config-name" type="xsd:token" minOccurs="0"/>
- <xsd:element name="config-file" type="xsd:token" minOccurs="0"/>
- <xsd:element name="port-component" type="jboss:portComponentType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="webservice-description" type="jboss:webserviceDescriptionType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="portComponentType">
- <xsd:sequence>
- <xsd:element name="ejb-name" type="xsd:token"/>
- <xsd:element name="port-component-name" type="xsd:token"/>
- <xsd:element name="port-component-uri" type="xsd:token" minOccurs="0"/>
- <xsd:element name="auth-method" type="xsd:token" minOccurs="0"/>
- <xsd:element name="transport-guarantee" type="xsd:token" minOccurs="0"/>
- <xsd:element name="secure-wsdl-access" type="xsd:boolean" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="webserviceDescriptionType">
- <xsd:sequence>
- <xsd:element name="webservice-description-name" type="xsd:token"/>
- <xsd:element name="wsdl-publish-location" type="xsd:token" minOccurs="0"/>
- <xsd:element name="port-component" type="jboss:portComponentType" minOccurs="1" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
-
-</xsd:schema>
12 years, 7 months
- 1
- 0
JBossWS SVN: r16309 - spi/trunk/src/main/resources/schema.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-05-24 06:48:57 -0400 (Thu, 24 May 2012)
New Revision: 16309
Added:
spi/trunk/src/main/resources/schema/jboss_web_services_1.0.xsd
Log:
Moving schema for jboss-webservices.xml (jboss_web_services_1.0.xsd) to jbossws-spi
Added: spi/trunk/src/main/resources/schema/jboss_web_services_1.0.xsd
===================================================================
--- spi/trunk/src/main/resources/schema/jboss_web_services_1.0.xsd (rev 0)
+++ spi/trunk/src/main/resources/schema/jboss_web_services_1.0.xsd 2012-05-24 10:48:57 UTC (rev 16309)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+ targetNamespace="http://www.jboss.com/xml/ns/javaee"
+ xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.1">
+
+ <xsd:element name="webservices" type="jboss:webservicesType"/>
+
+ <xsd:complexType name="webservicesType">
+ <xsd:sequence>
+ <xsd:element name="context-root" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="config-name" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="config-file" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="port-component" type="jboss:portComponentType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="webservice-description" type="jboss:webserviceDescriptionType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="portComponentType">
+ <xsd:sequence>
+ <xsd:element name="ejb-name" type="xsd:token"/>
+ <xsd:element name="port-component-name" type="xsd:token"/>
+ <xsd:element name="port-component-uri" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="auth-method" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="transport-guarantee" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="secure-wsdl-access" type="xsd:boolean" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="webserviceDescriptionType">
+ <xsd:sequence>
+ <xsd:element name="webservice-description-name" type="xsd:token"/>
+ <xsd:element name="wsdl-publish-location" type="xsd:token" minOccurs="0"/>
+ <xsd:element name="port-component" type="jboss:portComponentType" minOccurs="1" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+</xsd:schema>
12 years, 7 months
- 1
- 0
JBossWS SVN: r16308 - maven/parent/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-05-23 10:40:49 -0400 (Wed, 23 May 2012)
New Revision: 16308
Modified:
maven/parent/trunk/pom.xml
Log:
Moving to maven compiler plugin 2.4
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2012-05-23 14:26:09 UTC (rev 16307)
+++ maven/parent/trunk/pom.xml 2012-05-23 14:40:49 UTC (rev 16308)
@@ -139,7 +139,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
12 years, 7 months
- 1
- 0