JBossWS SVN: r14508 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2011-06-10 06:50:56 -0400 (Fri, 10 Jun 2011)
New Revision: 14508
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-6706/
Log:
JBPAPP-6706 one off patch branch
13 years, 9 months
JBossWS SVN: r14507 - spi/trunk/src/main/java/org/jboss/wsf/spi/util.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-10 06:44:08 -0400 (Fri, 10 Jun 2011)
New Revision: 14507
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/util/StAXUtils.java
Log:
Enriching StAXUtils
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/util/StAXUtils.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/util/StAXUtils.java 2011-06-10 04:39:26 UTC (rev 14506)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/util/StAXUtils.java 2011-06-10 10:44:08 UTC (rev 14507)
@@ -135,11 +135,7 @@
public static QName elementAsQName(XMLStreamReader reader) throws XMLStreamException
{
String text = elementAsString(reader);
- 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 ? reader.getNamespaceURI() : reader.getNamespaceURI(prefix);
- return prefix == null ? new QName(namespaceURI, localPart) : new QName(namespaceURI, localPart, prefix);
+ return stringToQName(reader, text, reader.getNamespaceURI());
}
public static boolean elementAsBoolean(XMLStreamReader reader) throws XMLStreamException
@@ -153,4 +149,42 @@
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);
+ }
+ }
}
13 years, 9 months
JBossWS SVN: r14506 - spi/branches/JBWS-3286/src/main/java/org/jboss/wsf/spi/management.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-06-10 00:39:26 -0400 (Fri, 10 Jun 2011)
New Revision: 14506
Modified:
spi/branches/JBWS-3286/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
Log:
[JBWS-3286]:Add jaxws endpoint configuration apis in ServerConfig interface
Modified: spi/branches/JBWS-3286/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
===================================================================
--- spi/branches/JBWS-3286/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2011-06-10 04:38:12 UTC (rev 14505)
+++ spi/branches/JBWS-3286/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2011-06-10 04:39:26 UTC (rev 14506)
@@ -23,7 +23,10 @@
import java.io.File;
import java.net.UnknownHostException;
+import java.util.List;
+import org.jboss.wsf.spi.metadata.config.EndpointConfig;
+
/**
* Interface to container independent config
*
@@ -60,4 +63,8 @@
boolean isModifySOAPAddress();
void setModifySOAPAddress(boolean flag);
+
+ void addEndpointConfig(EndpointConfig config);
+
+ List<EndpointConfig> getEndpointConfigs();
}
13 years, 9 months
JBossWS SVN: r14505 - stack/cxf/branches/JBWS-3286/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-06-10 00:38:12 -0400 (Fri, 10 Jun 2011)
New Revision: 14505
Modified:
stack/cxf/branches/JBWS-3286/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
Log:
[JBWS-3286]:Get jaxws endpoint configuration from ServerConfig
Modified: stack/cxf/branches/JBWS-3286/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/branches/JBWS-3286/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2011-06-09 16:19:51 UTC (rev 14504)
+++ stack/cxf/branches/JBWS-3286/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2011-06-10 04:38:12 UTC (rev 14505)
@@ -26,8 +26,12 @@
import org.apache.cxf.frontend.ServerFactoryBean;
import org.jboss.ws.api.annotation.EndpointConfig;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.config.ConfigMetaDataParser;
import org.jboss.wsf.spi.metadata.config.ConfigRoot;
import org.jboss.wsf.stack.cxf.AbstractInvoker;
@@ -93,17 +97,31 @@
if (epConfig != null)
{
String configFile = epConfig.configFile();
- try
+ if (configFile.isEmpty())
{
- UnifiedVirtualFile vf = deploymentRoot.findChild(configFile);
- ConfigRoot config = ConfigMetaDataParser.parse(vf.toURL());
- endpoint.setEndpointConfig(config.getEndpointConfigByName(epConfig.configName()));
+ try
+ {
+ UnifiedVirtualFile vf = deploymentRoot.findChild(configFile);
+ ConfigRoot config = ConfigMetaDataParser.parse(vf.toURL());
+ endpoint.setEndpointConfig(config.getEndpointConfigByName(epConfig.configName()));
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("Could not find " + configFile);
+ }
+ } else {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+ for(org.jboss.wsf.spi.metadata.config.EndpointConfig config : serverConfig.getEndpointConfigs())
+ {
+ if (config.getConfigName().equals(epConfig.configName()))
+ {
+ endpoint.setEndpointConfig(config);
+ break;
+ }
+ }
}
- catch (IOException e)
- {
- throw new RuntimeException("Could not find " + configFile);
- }
- //TODO [JBWS-3286] use default endpoint configuration as a fallback
+
}
}
}
13 years, 9 months
JBossWS SVN: r14504 - common/trunk/src/main/java/org/jboss/ws/common/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-09 12:19:51 -0400 (Thu, 09 Jun 2011)
New Revision: 14504
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentModelFactory.java
common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeploymentModelFactory.java
Log:
[JBWS-3312] Remove deprecated methods
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentModelFactory.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentModelFactory.java 2011-06-09 16:13:22 UTC (rev 14503)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentModelFactory.java 2011-06-09 16:19:51 UTC (rev 14504)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -42,15 +42,6 @@
return new DefaultService();
}
- @Deprecated
- /**
- * Use #newHttpEndpoint(String) instead
- */
- public Endpoint newEndpoint(String targetBean)
- {
- return this.newHttpEndpoint(targetBean);
- }
-
public Endpoint newHttpEndpoint(String targetBean)
{
return new DefaultHttpEndpoint(targetBean);
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeploymentModelFactory.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeploymentModelFactory.java 2011-06-09 16:13:22 UTC (rev 14503)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultDeploymentModelFactory.java 2011-06-09 16:19:51 UTC (rev 14504)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -42,15 +42,6 @@
return new DefaultService();
}
- @Deprecated
- /**
- * Use #newHttpEndpoint(String) instead
- */
- public Endpoint newEndpoint(String targetBean)
- {
- return this.newHttpEndpoint(targetBean);
- }
-
public Endpoint newHttpEndpoint(String targetBean)
{
return new DefaultHttpEndpoint(targetBean);
13 years, 9 months
JBossWS SVN: r14503 - spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-09 12:13:22 -0400 (Thu, 09 Jun 2011)
New Revision: 14503
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
Log:
[JBWS-3312] Remove deprecated methods
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2011-06-09 16:03:44 UTC (rev 14502)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2011-06-09 16:13:22 UTC (rev 14503)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -33,14 +33,8 @@
public abstract Service newService();
- @Deprecated
- /**
- * DEPRECATED: Use #newHttpEndpoint(String s) or new JMSEndpoint(String s) instead
- */
- public abstract Endpoint newEndpoint(String targetBean);
-
public abstract Endpoint newHttpEndpoint(String targetBean);
public abstract Endpoint newJMSEndpoint(String targetBean);
-
+
}
13 years, 9 months
JBossWS SVN: r14502 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-09 12:03:44 -0400 (Thu, 09 Jun 2011)
New Revision: 14502
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java
Log:
[JBWS-3312] Use newHttpEndpoint instead of newEndpoint
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java 2011-06-09 16:02:55 UTC (rev 14501)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java 2011-06-09 16:03:44 UTC (rev 14502)
@@ -180,7 +180,7 @@
final ClassLoader loader = endpointClass.getClassLoader();
final ArchiveDeployment dep = (ArchiveDeployment) NettyHttpServerAdapter.DEPLOYMENT_FACTORY.newDeployment(contextRoot, loader);
- final org.jboss.wsf.spi.deployment.Endpoint endpoint = NettyHttpServerAdapter.DEPLOYMENT_FACTORY.newEndpoint(endpointClass.getName());
+ final org.jboss.wsf.spi.deployment.Endpoint endpoint = NettyHttpServerAdapter.DEPLOYMENT_FACTORY.newHttpEndpoint(endpointClass.getName());
endpoint.setShortName(this.getEndpointRegistryPath(epImpl));
endpoint.setURLPattern(epImpl.getPathWithoutContext());
dep.getService().addEndpoint(endpoint);
13 years, 9 months
JBossWS SVN: r14501 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jaxbcust.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-09 12:02:55 -0400 (Thu, 09 Jun 2011)
New Revision: 14501
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java
Log:
[JBWS-3312] use newHttpEndpoint instead of newEndpoint
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java 2011-06-09 15:51:15 UTC (rev 14500)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jaxbcust/BindingCustomizationTestCase.java 2011-06-09 16:02:55 UTC (rev 14501)
@@ -51,7 +51,7 @@
public void testCustomizationWriteAccess() throws Exception
{
- Endpoint endpoint = deploymentModelFactory.newEndpoint(null);
+ Endpoint endpoint = deploymentModelFactory.newHttpEndpoint(null);
BindingCustomization jaxbCustomization = new JAXBBindingCustomization();
jaxbCustomization.put("com.sun.xml.bind.defaultNamespaceRemap", "http://org.jboss.bindingCustomization");
endpoint.addAttachment(BindingCustomization.class, jaxbCustomization);
@@ -72,7 +72,7 @@
public void testCustomizationReadAccess() throws Exception
{
- Endpoint endpoint = deploymentModelFactory.newEndpoint(null);
+ Endpoint endpoint = deploymentModelFactory.newHttpEndpoint(null);
BindingCustomization jaxbCustomization = new JAXBBindingCustomization();
jaxbCustomization.put("com.sun.xml.bind.defaultNamespaceRemap", "http://org.jboss.bindingCustomization");
endpoint.addAttachment(BindingCustomization.class, jaxbCustomization);
@@ -86,7 +86,7 @@
try
{
endpoint.addAttachment(BindingCustomization.class, jaxbCustomization);
- fail("Started Endpoints should only axpose read acccess to their binding customizations");
+ fail("Started Endpoints should only expose read acccess to their binding customizations");
}
catch (Exception e)
{
13 years, 9 months
JBossWS SVN: r14500 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-09 11:51:15 -0400 (Thu, 09 Jun 2011)
New Revision: 14500
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
Log:
[JBWS-3310] Do not deploy *-client.jar archives during testsuite
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-06-09 12:59:08 UTC (rev 14499)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-06-09 15:51:15 UTC (rev 14500)
@@ -151,21 +151,23 @@
for (int i = 0; i < archives.length; i++)
{
String archive = archives[i];
- try
- {
- JBossWSTestHelper.deploy(archive);
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- JBossWSTestHelper.undeploy(archive);
- }
-
if (archive.endsWith("-client.jar"))
{
URL archiveURL = getArchiveURL(archive);
clientJars.add(archiveURL);
}
+ else
+ {
+ try
+ {
+ JBossWSTestHelper.deploy(archive);
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ JBossWSTestHelper.undeploy(archive);
+ }
+ }
}
ClassLoader parent = Thread.currentThread().getContextClassLoader();
13 years, 9 months
JBossWS SVN: r14499 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-09 08:59:08 -0400 (Thu, 09 Jun 2011)
New Revision: 14499
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
enable another test
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-09 12:57:25 UTC (rev 14498)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-09 12:59:08 UTC (rev 14499)
@@ -800,7 +800,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
<!-- TODO: Classpath visibility issues - investigate -->
- <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
13 years, 9 months