JBossWS SVN: r16554 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-27 12:20:28 -0400 (Fri, 27 Jul 2012)
New Revision: 16554
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/StAXUtils.java
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
Log:
[JBPAPP-9224] Workaround for preventing potentially vulnerable scenarios
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2012-07-27 11:04:16 UTC (rev 16553)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2012-07-27 16:20:28 UTC (rev 16554)
@@ -21,21 +21,29 @@
*/
package org.jboss.wsf.stack.cxf;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
+import javax.jws.WebService;
+import javax.xml.stream.XMLStreamReader;
import javax.xml.ws.BindingType;
+import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.soap.MTOM;
import javax.xml.ws.soap.SOAPBinding;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
@@ -71,7 +79,7 @@
cxfURL = generateCXFConfigFromDeployment(dep);
}
putCXFConfigToDeployment(dep, cxfURL);
-
+ checkCVE20122379(dep, cxfURL);
}
@Override
@@ -96,25 +104,7 @@
*/
private URL getCXFConfigFromDeployment(Deployment dep)
{
- DeploymentType depType = dep.getType();
-
- String metadir;
- if (depType == DeploymentType.JAXWS_EJB3)
- {
- // expected resource location for EJB3 deployments
- metadir = "META-INF";
- }
- else if (depType == DeploymentType.JAXWS_JSE)
- {
- // expected resource location for POJO deployments
- metadir = "WEB-INF";
- }
- else
- {
- // only POJO and EJB3 deployments are supported
- throw new IllegalStateException("Unsupported deployment type: " + depType);
- }
-
+ final String metadir = getMetaDir(dep);
URL cxfURL = null;
try
{
@@ -131,6 +121,26 @@
return cxfURL;
}
+ private String getMetaDir(Deployment dep) {
+
+ DeploymentType depType = dep.getType();
+ if (depType == DeploymentType.JAXWS_EJB3)
+ {
+ // expected resource location for EJB3 deployments
+ return "META-INF";
+ }
+ else if (depType == DeploymentType.JAXWS_JSE)
+ {
+ // expected resource location for POJO deployments
+ return "WEB-INF";
+ }
+ else
+ {
+ // only POJO and EJB3 deployments are supported
+ throw new IllegalStateException("Unsupported deployment type: " + depType);
+ }
+ }
+
/**
* Generated CXF descriptor from deployment
* @param dep deployment
@@ -162,7 +172,6 @@
ddep.setInvoker(invokerJSE);
}
-
log.info("Add " + ddep);
dd.addEndpoint(ddep);
}
@@ -210,5 +219,129 @@
return mtomEnabled;
}
+
+ private void checkCVE20122379(Deployment dep, URL cxfURL)
+ {
+ try {
+ Set<String> wsdlLocations = new HashSet<String>();
+ //first check jbossws-cxf.xml
+ Set<String> endpoints = checkAssertionsAndGet(cxfURL, "http://cxf.apache.org/jaxws", "endpoint", "implementor");
+ ClassLoader cl = dep.getRuntimeClassLoader();
+ if (cl == null) {
+ cl = dep.getInitialClassLoader();
+ }
+ System.out.println("** CL: " + cl);
+ for (String ep : endpoints)
+ {
+ Class<?> clazz = cl.loadClass(ep);
+ String wl = null;
+ if (clazz.isAnnotationPresent(WebService.class)) {
+ WebService wsa = clazz.getAnnotation(WebService.class);
+ wl = wsa.wsdlLocation();
+ String epIf = wsa.endpointInterface();
+ if(epIf != null && !epIf.isEmpty()) {
+ Class<?> epIfClass = cl.loadClass(epIf);
+ WebService epIfWsa = epIfClass.getAnnotation(WebService.class);
+ if (epIfWsa != null && epIfWsa.wsdlLocation() != null && !epIfWsa.wsdlLocation().isEmpty()) {
+ wl = epIfWsa.wsdlLocation();
+ }
+ }
+ } else {
+ WebServiceProvider wsp = clazz.getAnnotation(WebServiceProvider.class);
+ wl = wsp.wsdlLocation();
+ }
+ if (wl != null && !wl.trim().isEmpty()) {
+ wsdlLocations.add(wl);
+ }
+ }
+ //then check wsdl files for contract first endpoints
+ for (String w : wsdlLocations) {
+ try
+ {
+ ArchiveDeployment archDep = (ArchiveDeployment)dep;
+ URL wsdlURL = archDep.getResourceResolver().resolve(w);
+ checkAssertionsAndGet(wsdlURL, null, null, null);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private Set<String> checkAssertionsAndGet(URL cxfUrl, String searchNS, String searchLocalName, String searchAttributeName) throws Exception
+ {
+ log.info("* checking... " + cxfUrl);
+ InputStream is = null;
+ XMLStreamReader reader = null;
+ Set<String> endpoints = new HashSet<String>();
+ final boolean search = searchNS != null || searchLocalName != null || searchAttributeName != null;
+ try
+ {
+ is = cxfUrl.openStream();
+ reader = StAXUtils.createXMLStreamReader(is);
+ while (reader.hasNext())
+ {
+ switch (reader.next())
+ {
+ case START_ELEMENT:
+ {
+ if (StAXUtils.match(reader, NAMESPACES, ASSERTIONS))
+ {
+ throw new RuntimeException("WS-Security Policy SupportingTokens not allowed due to known security vulnerability! URL: " + cxfUrl);
+ }
+ else if (search && StAXUtils.match(reader, searchNS, searchLocalName))
+ {
+ String e = reader.getAttributeValue(null, searchAttributeName).trim();
+ System.out.println("--> " + e);
+ endpoints.add(e);
+ }
+ }
+ }
+ }
+ }
+ finally
+ {
+ try {
+ reader.close();
+ } catch (Exception e) {}
+ try {
+ is.close();
+ } catch (Exception e) {}
+ }
+ return endpoints;
+ }
+
+ private static final String SP_NS_11 = "http://schemas.xmlsoap.org/ws/2005/02/securitypolicy";
+ private static final String SP_NS_12 = "http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";
+ private static final String SP_NS_13 = "http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802";
+ private static final String SUPPORTING_TOKENS = "SupportingTokens";
+ private static final String SIGNED_SUPPORTING_TOKENS = "SignedSupportingTokens";
+ private static final String ENDORSING_SUPPORTING_TOKENS = "EndorsingSupportingTokens";
+ private static final String SIGNED_ENDORSING_SUPPORTING_TOKENS = "SignedEndorsingSupportingTokens";
+ private static final String SIGNED_ENCRYPTED_SUPPORTING_TOKENS = "SignedEncryptedSupportingTokens";
+ private static final String ENCRYPTED_SUPPORTING_TOKENS = "EncryptedSupportingTokens";
+ private static final String ENDORSING_ENCRYPTED_SUPPORTING_TOKENS = "EndorsingEncryptedSupportingTokens";
+ private static final String SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS = "SignedEndorsingEncryptedSupportingTokens";
+ private static String[] NAMESPACES = new String[3];
+ private static String[] ASSERTIONS = new String[8];
+ static {
+ NAMESPACES[0] = SP_NS_11;
+ NAMESPACES[1] = SP_NS_12;
+ NAMESPACES[2] = SP_NS_13;
+ ASSERTIONS[0] = SUPPORTING_TOKENS;
+ ASSERTIONS[1] = SIGNED_SUPPORTING_TOKENS;
+ ASSERTIONS[2] = ENDORSING_SUPPORTING_TOKENS;
+ ASSERTIONS[3] = SIGNED_ENDORSING_SUPPORTING_TOKENS;
+ ASSERTIONS[4] = SIGNED_ENCRYPTED_SUPPORTING_TOKENS;
+ ASSERTIONS[5] = ENCRYPTED_SUPPORTING_TOKENS;
+ ASSERTIONS[6] = ENDORSING_ENCRYPTED_SUPPORTING_TOKENS;
+ ASSERTIONS[7] = SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS;
+ }
}
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/StAXUtils.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/StAXUtils.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/StAXUtils.java 2012-07-27 16:20:28 UTC (rev 16554)
@@ -0,0 +1,210 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf;
+
+import java.io.InputStream;
+import java.util.ResourceBundle;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLResolver;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+/**
+ * StAX utils
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 27-Nov-2010
+ */
+public class StAXUtils
+{
+ private static final BlockingQueue<XMLInputFactory> INPUT_FACTORY_POOL;
+
+ static
+ {
+ int i = 10;
+ try
+ {
+ String s = System.getProperty("org.jboss.ws.staxutils.pool-size", "10");
+ i = Integer.parseInt(s);
+ }
+ catch (Throwable t)
+ {
+ i = 10;
+ }
+ if (i <= 0)
+ {
+ i = 10;
+ }
+ INPUT_FACTORY_POOL = new LinkedBlockingQueue<XMLInputFactory>(i);
+ }
+
+ /**
+ * Return a new factory so that the caller can set sticky parameters.
+ * @param nsAware
+ * @return
+ */
+ public static XMLInputFactory createXMLInputFactory(boolean nsAware)
+ {
+ XMLInputFactory factory = XMLInputFactory.newInstance();
+ factory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, nsAware);
+ factory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
+ factory.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, Boolean.FALSE);
+ factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
+ factory.setXMLResolver(new XMLResolver()
+ {
+ public Object resolveEntity(String publicID, String systemID, String baseURI, String namespace)
+ throws XMLStreamException
+ {
+ throw new XMLStreamException("READING_EXTERNAL_ENTITIES_IS_DISABLED");
+ }
+ });
+ return factory;
+ }
+
+ private static XMLInputFactory getXMLInputFactory()
+ {
+ XMLInputFactory f = INPUT_FACTORY_POOL.poll();
+ if (f == null)
+ {
+ f = createXMLInputFactory(true);
+ }
+ return f;
+ }
+
+ private static void returnXMLInputFactory(XMLInputFactory factory)
+ {
+ INPUT_FACTORY_POOL.offer(factory);
+ }
+
+ public static XMLStreamReader createXMLStreamReader(InputStream in)
+ {
+ XMLInputFactory factory = getXMLInputFactory();
+ try
+ {
+ return factory.createXMLStreamReader(in);
+ }
+ catch (XMLStreamException e)
+ {
+ throw new RuntimeException("Could not parse stream", e);
+ }
+ finally
+ {
+ returnXMLInputFactory(factory);
+ }
+ }
+
+ public static boolean match(XMLStreamReader reader, QName name)
+ {
+ return reader.getName().equals(name);
+ }
+
+ public static boolean match(XMLStreamReader reader, String namespace, String localName)
+ {
+ QName name = reader.getName();
+ return localName.equals(name.getLocalPart()) && namespace.equals(name.getNamespaceURI());
+ }
+
+ public static boolean match(XMLStreamReader reader, String[] namespaces, String[] localNames)
+ {
+ QName name = reader.getName();
+ boolean matchedNS = false;
+ for (String n : namespaces) {
+ if (!matchedNS && n.equals(name.getNamespaceURI())) {
+ matchedNS = true;
+ }
+ }
+ if (matchedNS) {
+ for (String l : localNames) {
+ if (l.equals(name.getLocalPart())) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ public static String elementAsString(XMLStreamReader reader) throws XMLStreamException
+ {
+ String elementtext = reader.getElementText();
+ return elementtext == null ? null : elementtext.trim();
+ }
+
+ public static QName elementAsQName(XMLStreamReader reader) throws XMLStreamException
+ {
+ String text = elementAsString(reader);
+ return stringToQName(reader, text, reader.getNamespaceURI());
+ }
+
+ public static boolean elementAsBoolean(XMLStreamReader reader) throws XMLStreamException
+ {
+ String text = elementAsString(reader);
+ return Boolean.parseBoolean(text);
+ }
+
+ public static int elementAsInt(XMLStreamReader reader) throws XMLStreamException
+ {
+ String text = elementAsString(reader);
+ return Integer.parseInt(text);
+ }
+
+ public static QName attributeAsQName(XMLStreamReader reader, String namespace, String localName) throws XMLStreamException
+ {
+ String text = reader.getAttributeValue(namespace, localName);
+ return stringToQName(reader, text, reader.getNamespaceURI());
+ }
+
+ public static QName attributeAsQName(XMLStreamReader reader, String namespace, String localName, String targetNS) throws XMLStreamException
+ {
+ String text = reader.getAttributeValue(namespace, localName);
+ return stringToQName(reader, text, targetNS);
+ }
+
+ private static QName stringToQName(XMLStreamReader reader, String text, String defaultNS)
+ {
+ String localPart = text.substring(text.indexOf(':') + 1, text.length());
+ int i = text.indexOf(':');
+ String prefix = i < 0 ? null : text.substring(0, i);
+ String namespaceURI = prefix == null ? defaultNS : reader.getNamespaceURI(prefix);
+ return prefix == null ? new QName(namespaceURI, localPart) : new QName(namespaceURI, localPart, prefix);
+ }
+
+ public static int nextElement(XMLStreamReader reader)
+ {
+ try
+ {
+ int x = reader.next();
+ while (x != XMLStreamReader.START_ELEMENT && x != XMLStreamReader.END_ELEMENT && reader.hasNext())
+ {
+ x = reader.next();
+ }
+ return x;
+ }
+ catch (XMLStreamException e)
+ {
+ throw new RuntimeException("COULDN'T_PARSE_STREAM", e);
+ }
+ }
+}
12 years, 5 months
JBossWS SVN: r16553 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-27 07:04:16 -0400 (Fri, 27 Jul 2012)
New Revision: 16553
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java
Log:
Another try...
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2012-07-27 08:47:57 UTC (rev 16552)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2012-07-27 11:04:16 UTC (rev 16553)
@@ -63,21 +63,19 @@
assertTrue(helper.testSignEncryptUsingConfigProperties());
}
- public void testServerSide() throws Exception
+// public void testServerSide() throws Exception
+// {
+// URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
+// "path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncrypt&helper=" + SignEncryptHelper.class.getName());
+// BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+// assertEquals("1", br.readLine());
+// }
+
+ public void testServerSideUsingConfigProperties() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
- "path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncrypt&helper=" + SignEncryptHelper.class.getName());
+ "path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncryptUsingConfigProperties&helper=" + SignEncryptHelper.class.getName());
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
assertEquals("1", br.readLine());
}
-
- public void testServerSideUsingConfigProperties() throws Exception
- {
- //TODO!!
- testServerSide();
-// URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
-// "path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncryptUsingConfigProperties&helper=" + SignEncryptHelper.class.getName());
-// BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
-// assertEquals("1", br.readLine());
- }
}
12 years, 5 months
JBossWS SVN: r16552 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-27 04:47:57 -0400 (Fri, 27 Jul 2012)
New Revision: 16552
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java
Log:
Trying change on test to figure out the reason for failures reproducable on hudson only...
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2012-07-26 14:05:19 UTC (rev 16551)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2012-07-27 08:47:57 UTC (rev 16552)
@@ -73,9 +73,11 @@
public void testServerSideUsingConfigProperties() throws Exception
{
- URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
- "path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncryptUsingConfigProperties&helper=" + SignEncryptHelper.class.getName());
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("1", br.readLine());
+ //TODO!!
+ testServerSide();
+// URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
+// "path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncryptUsingConfigProperties&helper=" + SignEncryptHelper.class.getName());
+// BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+// assertEquals("1", br.readLine());
}
}
12 years, 5 months
JBossWS SVN: r16551 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-26 10:05:19 -0400 (Thu, 26 Jul 2012)
New Revision: 16551
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java
Log:
[JBWS-3529] Fixing common testcase
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2012-07-26 14:04:53 UTC (rev 16550)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2012-07-26 14:05:19 UTC (rev 16551)
@@ -47,11 +47,15 @@
* Verifies the client configurer is properly resolved
*/
public void testClientConfigurer() {
- assertTrue(getHelper().testClientConfigurer());
+ if (isIntegrationCXF()) {
+ assertTrue(getHelper().testClientConfigurer());
+ }
}
public void testClientConfigurerInContainer() throws Exception {
- assertEquals("1", runTestInContainer("testClientConfigurer"));
+ if (isIntegrationCXF()) {
+ assertEquals("1", runTestInContainer("testClientConfigurer"));
+ }
}
/**
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java 2012-07-26 14:04:53 UTC (rev 16550)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/clientConfig/Helper.java 2012-07-26 14:05:19 UTC (rev 16551)
@@ -49,7 +49,7 @@
if (configurer == null) {
return false;
}
- return "org.jboss.ws.common.configuration.ConfigHelper".equals(configurer.getClass().getName());
+ return "org.jboss.wsf.stack.cxf.client.configuration.CXFClientConfigurer".equals(configurer.getClass().getName());
}
public boolean testCustomClientConfigurationFromFile() throws Exception
12 years, 5 months
JBossWS SVN: r16550 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-26 10:04:53 -0400 (Thu, 26 Jul 2012)
New Revision: 16550
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/jaxws-client-config.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java
Log:
[JBWS-3529] Adding wsse testcase
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 2012-07-26 14:04:23 UTC (rev 16549)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-07-26 14:04:53 UTC (rev 16550)
@@ -188,6 +188,7 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF">
<include name="alice.properties" />
<include name="alice.jks" />
+ <include name="jaxws-client-config.xml" />
</metainf>
</jar>
<war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-sign-encrypt-client.war" needxmlfile='false'>
@@ -201,6 +202,7 @@
<zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/sign-encrypt" prefix="WEB-INF/classes">
<include name="META-INF/alice.properties" />
<include name="META-INF/alice.jks" />
+ <include name="META-INF/jaxws-client-config.xml" />
</zipfileset>
<manifest>
<attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services, org.apache.ws.security"/>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2012-07-26 14:04:23 UTC (rev 16549)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2012-07-26 14:04:53 UTC (rev 16550)
@@ -56,6 +56,13 @@
assertTrue(helper.testSignEncrypt());
}
+ public void testClientSideUsingConfigProperties() throws Exception
+ {
+ SignEncryptHelper helper = new SignEncryptHelper();
+ helper.setTargetEndpoint(serviceURL);
+ assertTrue(helper.testSignEncryptUsingConfigProperties());
+ }
+
public void testServerSide() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
@@ -63,4 +70,12 @@
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
assertEquals("1", br.readLine());
}
+
+ public void testServerSideUsingConfigProperties() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
+ "path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncryptUsingConfigProperties&helper=" + SignEncryptHelper.class.getName());
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("1", br.readLine());
+ }
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java 2012-07-26 14:04:23 UTC (rev 16549)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptHelper.java 2012-07-26 14:04:53 UTC (rev 16550)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.basic;
+import java.net.MalformedURLException;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -31,6 +32,8 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.ws.api.configuration.ClientConfigUtil;
+import org.jboss.ws.api.configuration.ClientConfigurer;
import org.jboss.wsf.test.ClientHelper;
public class SignEncryptHelper implements ClientHelper
@@ -49,20 +52,9 @@
try
{
BusFactory.setThreadDefaultBus(bus);
-
- QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
- URL wsdlURL = new URL(targetEndpoint + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ ServiceIface proxy = getProxy();
setupWsse(proxy);
- try
- {
- return "Secure Hello World!".equals(proxy.sayHello());
- }
- catch (SOAPFaultException e)
- {
- throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
- }
+ return invoke(proxy);
}
finally
{
@@ -70,6 +62,40 @@
}
}
+ public boolean testSignEncryptUsingConfigProperties() throws Exception
+ {
+ Bus bus = BusFactory.newInstance().createBus();
+ try
+ {
+ BusFactory.setThreadDefaultBus(bus);
+ ServiceIface proxy = getProxy();
+ ClientConfigUtil.setConfigProperties(proxy, "META-INF/jaxws-client-config.xml", "Custom WS-Security Client");
+ return invoke(proxy);
+ }
+ finally
+ {
+ bus.shutdown(true);
+ }
+ }
+
+ private ServiceIface getProxy() throws MalformedURLException {
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
+ URL wsdlURL = new URL(targetEndpoint + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ return (ServiceIface)service.getPort(ServiceIface.class);
+ }
+
+ private boolean invoke(ServiceIface proxy) throws Exception {
+ try
+ {
+ return "Secure Hello World!".equals(proxy.sayHello());
+ }
+ catch (SOAPFaultException e)
+ {
+ throw new Exception("Please check that the Bouncy Castle provider is installed.", e);
+ }
+ }
+
private void setupWsse(ServiceIface proxy)
{
((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
@@ -78,5 +104,4 @@
((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
}
-
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java 2012-07-26 14:04:23 UTC (rev 16549)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptTestCase.java 2012-07-26 14:04:53 UTC (rev 16550)
@@ -55,6 +55,13 @@
assertTrue(helper.testSignEncrypt());
}
+ public void testClientSideUsingConfigProperties() throws Exception
+ {
+ SignEncryptHelper helper = new SignEncryptHelper();
+ helper.setTargetEndpoint(serviceURL);
+ assertTrue(helper.testSignEncryptUsingConfigProperties());
+ }
+
public void testServerSide() throws Exception
{
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
@@ -62,4 +69,12 @@
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
assertEquals("1", br.readLine());
}
+
+ public void testServerSideUsingConfigProperties() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" +
+ "path=/jaxws-samples-wsse-policy-sign-encrypt&method=testSignEncryptUsingConfigProperties&helper=" + SignEncryptHelper.class.getName());
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ assertEquals("1", br.readLine());
+ }
}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/jaxws-client-config.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/jaxws-client-config.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/META-INF/jaxws-client-config.xml 2012-07-26 14:04:53 UTC (rev 16550)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd">
+
+ <client-config>
+ <config-name>Custom WS-Security Client</config-name>
+ <property>
+ <property-name>ws-security.signature.properties</property-name>
+ <property-value>META-INF/alice.properties</property-value>
+ </property>
+ <property>
+ <property-name>ws-security.encryption.properties</property-name>
+ <property-value>META-INF/alice.properties</property-value>
+ </property>
+ <property>
+ <property-name>ws-security.signature.username</property-name>
+ <property-value>alice</property-value>
+ </property>
+ <property>
+ <property-name>ws-security.encryption.username</property-name>
+ <property-value>bob</property-value>
+ </property>
+ <property>
+ <property-name>ws-security.callback-handler</property-name>
+ <property-value>org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback</property-value>
+ </property>
+ </client-config>
+
+</jaxws-config>
\ No newline at end of file
12 years, 5 months
JBossWS SVN: r16549 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-26 10:04:23 -0400 (Thu, 26 Jul 2012)
New Revision: 16549
Added:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java
stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.ws.api.configuration.ClientConfigurer
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml
Log:
[JBWS-3529] Adding jbossws-cxf implementation of ClientConfigurer
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2012-07-26 14:03:29 UTC (rev 16548)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2012-07-26 14:04:23 UTC (rev 16549)
@@ -42,6 +42,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.jaxws.ServiceImpl;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
@@ -54,6 +55,7 @@
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.config.ClientConfig;
+import org.jboss.wsf.stack.cxf.client.configuration.CXFClientConfigurer;
import org.jboss.wsf.stack.cxf.client.configuration.HandlerChainSortInterceptor;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory;
import org.w3c.dom.Element;
@@ -462,14 +464,16 @@
WebServiceFeature... features) {
T port = super.createPort(portName, epr, serviceEndpointInterface, features);
Binding binding = ((BindingProvider)port).getBinding();
- ClientProxy.getClient(port).getOutInterceptors().add(new HandlerChainSortInterceptor(binding));
+ Client client = ClientProxy.getClient(port);
+ client.getOutInterceptors().add(new HandlerChainSortInterceptor(binding));
if (inContainer) {
ServerConfig sc = getServerConfig();
if (sc != null) {
for (ClientConfig config : sc.getClientConfigs()) {
if (config.getConfigName().equals(ClientConfig.STANDARD_CLIENT_CONFIG)) {
- ConfigHelper helper = new ConfigHelper();
+ CXFClientConfigurer helper = new CXFClientConfigurer();
helper.setupConfigHandlers(binding, config);
+ helper.setConfigProperties(client, config.getProperties());
}
}
}
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/CXFClientConfigurer.java 2012-07-26 14:04:23 UTC (rev 16549)
@@ -0,0 +1,49 @@
+/*
+ * 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.client.configuration;
+
+import java.util.Map;
+
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.jboss.ws.common.configuration.ConfigHelper;
+import org.jboss.wsf.spi.metadata.config.ClientConfig;
+
+/**
+ * CXF extension of common ClientConfigurer
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 25-Jul-2012
+ *
+ */
+public class CXFClientConfigurer extends ConfigHelper
+{
+ @Override
+ public void setConfigProperties(Object proxy, String configFile, String configName) {
+ ClientConfig config = readConfig(configFile, configName);
+ setConfigProperties(ClientProxy.getClient(proxy), config.getProperties());
+ }
+
+ public void setConfigProperties(Client client, Map<String, String> properties) {
+ client.getEndpoint().putAll(properties);
+ }
+}
Added: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.ws.api.configuration.ClientConfigurer
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.ws.api.configuration.ClientConfigurer (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.jboss.ws.api.configuration.ClientConfigurer 2012-07-26 14:04:23 UTC (rev 16549)
@@ -0,0 +1 @@
+org.jboss.wsf.stack.cxf.client.configuration.CXFClientConfigurer
\ No newline at end of file
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml 2012-07-26 14:03:29 UTC (rev 16548)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/api/main/module.xml 2012-07-26 14:04:23 UTC (rev 16549)
@@ -34,7 +34,7 @@
<module name="javax.xml.ws.api"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.modules"/>
- <module name="org.jboss.ws.common" services="import"/>
+ <module name="org.jboss.ws.jaxws-client" services="import"/>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml 2012-07-26 14:03:29 UTC (rev 16548)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml 2012-07-26 14:04:23 UTC (rev 16549)
@@ -34,7 +34,7 @@
<module name="javax.xml.ws.api"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.modules"/>
- <module name="org.jboss.ws.common" services="import"/>
+ <module name="org.jboss.ws.jaxws-client" services="import"/>
</dependencies>
</module>
12 years, 5 months
JBossWS SVN: r16548 - in common/trunk/src/main: resources/META-INF/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-26 10:03:29 -0400 (Thu, 26 Jul 2012)
New Revision: 16548
Removed:
common/trunk/src/main/resources/META-INF/services/org.jboss.ws.api.configuration.ClientConfigurer
Modified:
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/Message.properties
Log:
[JBWS-3529] Methods for setting up client config properties
Modified: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2012-07-26 14:02:54 UTC (rev 16547)
+++ common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2012-07-26 14:03:29 UTC (rev 16548)
@@ -79,8 +79,14 @@
ClientConfig config = readConfig(configFile, configName);
setupConfigHandlers(port.getBinding(), config);
}
+
+ @Override
+ public void setConfigProperties(Object proxy, String configFile, String configName)
+ {
+ throw new RuntimeException(BundleUtils.getMessage(bundle, "NOT_SUPPORTED", this.getClass()));
+ }
- private static ClientConfig readConfig(String configFile, String configName) {
+ protected ClientConfig readConfig(String configFile, String configName) {
if (configFile != null) {
InputStream is = null;
try
Modified: common/trunk/src/main/java/org/jboss/ws/common/configuration/Message.properties
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/configuration/Message.properties 2012-07-26 14:02:54 UTC (rev 16547)
+++ common/trunk/src/main/java/org/jboss/ws/common/configuration/Message.properties 2012-07-26 14:03:29 UTC (rev 16548)
@@ -3,4 +3,5 @@
NOT_HANDLER_INSTANCE={0} is not a JAX-WS Handler instance
CAN_NOT_ADD_HANDLER=Could not add handler {0} as part of client or endpoint configuration
COULD_NOT_READ_CONFIG=Could not read configuration from file {0}
-CONFIG_NOT_FOUND=Configuration {0} not found
\ No newline at end of file
+CONFIG_NOT_FOUND=Configuration {0} not found
+NOT_SUPPORTED=Operation not supported by ClientConfigurer: {0}
\ No newline at end of file
Deleted: common/trunk/src/main/resources/META-INF/services/org.jboss.ws.api.configuration.ClientConfigurer
===================================================================
--- common/trunk/src/main/resources/META-INF/services/org.jboss.ws.api.configuration.ClientConfigurer 2012-07-26 14:02:54 UTC (rev 16547)
+++ common/trunk/src/main/resources/META-INF/services/org.jboss.ws.api.configuration.ClientConfigurer 2012-07-26 14:03:29 UTC (rev 16548)
@@ -1 +0,0 @@
-org.jboss.ws.common.configuration.ConfigHelper
\ No newline at end of file
12 years, 5 months
JBossWS SVN: r16547 - api/trunk/src/main/java/org/jboss/ws/api/configuration.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-07-26 10:02:54 -0400 (Thu, 26 Jul 2012)
New Revision: 16547
Modified:
api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigUtil.java
api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigurer.java
Log:
[JBWS-3529] Adding methods for setting up client config properties
Modified: api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigUtil.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigUtil.java 2012-07-26 06:27:54 UTC (rev 16546)
+++ api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigUtil.java 2012-07-26 14:02:54 UTC (rev 16547)
@@ -24,7 +24,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Iterator;
-import java.util.ServiceLoader;
+import org.jboss.ws.api.util.ServiceLoader;
import javax.xml.ws.BindingProvider;
@@ -49,17 +49,32 @@
}
/**
- * Resolves a ClientConfigurer instance by first using the defining classloader and
- * failing that by using the current thread context classloader.
+ * Reads a client configuration and setups the properties in the provided proxy accordingly.
+ * This leverages the resolveClientConfigurer() method for getting the ClientConfigure to use.
*
+ * @param bp The client proxy (port) instance to setup
+ * @param configFile The configuration file
+ * @param configName The configuration name
+ */
+ public static void setConfigProperties(Object proxy, String configFile, String configName) {
+ ClientConfigurer configurer = resolveClientConfigurer();
+ configurer.setConfigProperties(proxy, configFile, configName);
+ }
+
+ /**
+ * Resolves a ClientConfigurer instance by first using the current thread context classloader and
+ * failing that by using the defining classloader.
+ *
* @return A ClientConfigurer instance
*/
public static ClientConfigurer resolveClientConfigurer() {
- Iterator<ClientConfigurer> it = ServiceLoader.load(ClientConfigurer.class, ClientConfigUtil.class.getClassLoader()).iterator();
- if (!it.hasNext()) {
- it = ServiceLoader.load(ClientConfigurer.class, getContextClassLoader()).iterator();
+ Iterator<ClientConfigurer> it = java.util.ServiceLoader.load(ClientConfigurer.class, getContextClassLoader()).iterator();
+ if (it.hasNext()) {
+ return it.next();
+ } else {
+ return (ClientConfigurer)ServiceLoader.loadService(ClientConfigurer.class.getName(),
+ "org.jboss.ws.common.configuration.ConfigHelper", ClientConfigUtil.class.getClassLoader());
}
- return it.next();
}
private static ClassLoader getContextClassLoader()
Modified: api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigurer.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigurer.java 2012-07-26 06:27:54 UTC (rev 16546)
+++ api/trunk/src/main/java/org/jboss/ws/api/configuration/ClientConfigurer.java 2012-07-26 14:02:54 UTC (rev 16547)
@@ -38,5 +38,14 @@
* @param configName The configuration name
*/
public void setConfigHandlers(BindingProvider bp, String configFile, String configName);
+
+ /**
+ * Reads a client configuration and setups the properties in the provided client proxy accordingly.
+ *
+ * @param proxy The client proxy (port)
+ * @param configFile The configuration file
+ * @param configName The configuration name
+ */
+ public void setConfigProperties(Object proxy, String configFile, String configName);
}
12 years, 5 months
JBossWS SVN: r16546 - in stack/native/branches/jbossws-native-3.1.2/modules: core/src/main/java/org/jboss/ws/metadata/builder/jaxws and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2012-07-26 02:27:54 -0400 (Thu, 26 Jul 2012)
New Revision: 16546
Added:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/jbossws-entities.properties
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaResourceResolver.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl
Log:
[JBPAPP-9337]:Add ability for deployments to include jbossws-entities.properties
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaResourceResolver.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaResourceResolver.java 2012-07-25 14:22:58 UTC (rev 16545)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/validation/SchemaResourceResolver.java 2012-07-26 06:27:54 UTC (rev 16546)
@@ -24,30 +24,52 @@
import java.io.ByteArrayInputStream;
import java.util.Map;
+import org.jboss.logging.Logger;
+import org.jboss.ws.core.utils.JBossWSEntityResolver;
import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSResourceResolver;
+import org.xml.sax.InputSource;
/**
* SchemaResourceResolver
*
* @author ema(a)redhat.com
*/
-public class SchemaResourceResolver implements LSResourceResolver {
- private Map<String, byte[]> streamMap;
-
- public SchemaResourceResolver(Map<String, byte[]> map) {
- streamMap = map;
- }
-
- public LSInput resolveResource(String type, String namespaceURI,
- String publicId, String systemId, String baseURI) {
- LSInput lsInput = null;
- if (streamMap.get(namespaceURI) != null) {
- byte[] value = streamMap.get(namespaceURI);
- lsInput = new LSInputImpl();
- lsInput.setByteStream(new ByteArrayInputStream(value));
- }
- return lsInput;
- }
+public class SchemaResourceResolver implements LSResourceResolver
+{
+ private static Logger log = Logger.getLogger(SchemaResourceResolver.class);
+ private Map<String, byte[]> streamMap;
+ public SchemaResourceResolver(Map<String, byte[]> map)
+ {
+ streamMap = map;
+ }
+
+ public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI)
+ {
+ LSInput lsInput = null;
+ if (streamMap.get(namespaceURI) != null)
+ {
+ byte[] value = streamMap.get(namespaceURI);
+ lsInput = new LSInputImpl();
+ lsInput.setByteStream(new ByteArrayInputStream(value));
+ }
+ try
+ {
+ JBossWSEntityResolver entityResolver = new JBossWSEntityResolver();
+ InputSource ins = entityResolver.resolveEntity(publicId, systemId);
+ if (ins != null)
+ {
+ lsInput = new LSInputImpl();
+ lsInput.setByteStream(ins.getByteStream());
+ }
+ }
+ catch (Exception e)
+ {
+ log.warn("Failed to resolve the schema", e);
+
+ }
+ return lsInput;
+ }
+
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2012-07-25 14:22:58 UTC (rev 16545)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2012-07-26 06:27:54 UTC (rev 16546)
@@ -52,15 +52,16 @@
if(null == runtimeClassLoader)
throw new IllegalArgumentException("Runtime classloader cannot be null");
wsMetaData.setClassLoader(runtimeClassLoader);
-
+ ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader(runtimeClassLoader);
// For every bean
for (Endpoint ep : dep.getService().getEndpoints())
{
String shortName = ep.getShortName();
Class beanClass = ep.getTargetBeanClass();
JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, beanClass, shortName);
- }
-
+ }
+ Thread.currentThread().setContextClassLoader(oldClassLoader);
log.debug("END buildMetaData: " + wsMetaData);
return wsMetaData;
}
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-07-25 14:22:58 UTC (rev 16545)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-07-26 06:27:54 UTC (rev 16546)
@@ -651,8 +651,19 @@
log.error(se.getMessage(), se);
}
}
- if (importedSchema == null)
+ if (importedSchema == null && entityResolver.getEntityMap().containsKey(currLoc.toExternalForm()))
{
+ try
+ {
+ importedSchema = DOMUtils.parse(entityResolver.resolveEntity(currLoc.toExternalForm(), currLoc.toExternalForm()).getByteStream());
+ }
+ catch (SAXException se)
+ {
+ log.error(se.getMessage(), se);
+ }
+
+ }
+ if (importedSchema == null) {
importedSchema = DOMUtils.parse(currLoc.openStream());
}
handleSchemaImports(importedSchema, currLoc);
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-07-25 14:22:58 UTC (rev 16545)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-07-26 06:27:54 UTC (rev 16546)
@@ -542,12 +542,15 @@
<!-- jaxws-jbws2526 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2526.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2526/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/jbws2526/*.class"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2526/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.class" />
+ <include name="org/jboss/test/ws/jaxws/jbws2526/server-handlers.xml" />
</classes>
+ <classes dir="${tests.output.dir}/test-resources/jaxws/jbws2526">
+ <include name="jbossws-entities.properties" />
+ </classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2526/WEB-INF">
- <include name="wsdl/**"/>
+ <include name="wsdl/**" />
</webinf>
</war>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2012-07-25 14:22:58 UTC (rev 16545)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1172/JBWS1172TestCase.java 2012-07-26 06:27:54 UTC (rev 16546)
@@ -59,8 +59,7 @@
{
return new JBossWSTestSetup(JBWS1172TestCase.class, "jaxws-jbws1172.war");
}
-
-
+
public void testSchemaValidationPositive() throws Exception
{
URL wsdlURL = getResourceURL("jaxws/jbws1172/WEB-INF/wsdl/TestService.wsdl");
@@ -164,6 +163,7 @@
}
}
+
public void testValidatingImportEndpoint() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1172/doval-import?wsdl");
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java 2012-07-25 14:22:58 UTC (rev 16545)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2526/JBWS2526TestCase.java 2012-07-26 06:27:54 UTC (rev 16546)
@@ -37,7 +37,8 @@
/**
* [JBWS-2526] org.jboss.ws.core.soap.TextImpl does not implement
* org.w3c.dom.Comment.
- *
+ * This testcase is also configured a jbossws-entity.properties
+ * to test the ablitly to resolve a import schema
* @author <a href="mailto:gturner@unzane.com">Gerald Turner</a>
*/
public class JBWS2526TestCase extends JBossWSTest
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl 2012-07-25 14:22:58 UTC (rev 16545)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/WEB-INF/wsdl/jbws2526.wsdl 2012-07-26 06:27:54 UTC (rev 16546)
@@ -10,7 +10,7 @@
<types>
<xs:schema>
<xs:import namespace="urn:JBWS-2526-Schema"
- schemaLocation="jbws2526.xsd"/>
+ schemaLocation="http://www.notexist.org/a.xsd"/>
</xs:schema>
</types>
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/jbossws-entities.properties
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/jbossws-entities.properties (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2526/jbossws-entities.properties 2012-07-26 06:27:54 UTC (rev 16546)
@@ -0,0 +1,2 @@
+http\://www.notexist.org/a.xsd=../wsdl/jbws2526.xsd
+
12 years, 5 months
JBossWS SVN: r16545 - in stack/native/branches/jbossws-native-3.1.2: modules/client and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-07-25 10:22:58 -0400 (Wed, 25 Jul 2012)
New Revision: 16545
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
prepare for next dev. cycle
Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2012-07-25 14:21:28 UTC (rev 16544)
+++ stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2012-07-25 14:22:58 UTC (rev 16545)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP13</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2012-07-25 14:21:28 UTC (rev 16544)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2012-07-25 14:22:58 UTC (rev 16545)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP13</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml 2012-07-25 14:21:28 UTC (rev 16544)
+++ stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml 2012-07-25 14:22:58 UTC (rev 16545)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP13</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml 2012-07-25 14:21:28 UTC (rev 16544)
+++ stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml 2012-07-25 14:22:58 UTC (rev 16545)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP13</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml 2012-07-25 14:21:28 UTC (rev 16544)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml 2012-07-25 14:22:58 UTC (rev 16545)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP13</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml 2012-07-25 14:21:28 UTC (rev 16544)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml 2012-07-25 14:22:58 UTC (rev 16545)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2.SP13</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml 2012-07-25 14:21:28 UTC (rev 16544)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml 2012-07-25 14:22:58 UTC (rev 16545)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2.SP13</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2012-07-25 14:21:28 UTC (rev 16544)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2012-07-25 14:22:58 UTC (rev 16545)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP13</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2012-07-25 14:21:28 UTC (rev 16544)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2012-07-25 14:22:58 UTC (rev 16545)
@@ -17,7 +17,7 @@
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
- <version>3.1.2.SP13</version>
+ <version>3.1.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -28,9 +28,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/branches/jbos...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/branches/jbossws-na...</url>
</scm>
<!-- Modules -->
12 years, 5 months