JBossWS SVN: r7339 - container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-04 09:18:18 -0400 (Wed, 04 Jun 2008)
New Revision: 7339
Modified:
container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java
Log:
Init WSFRuntime from SPIProvider
Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java
===================================================================
--- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java 2008-06-04 13:12:59 UTC (rev 7338)
+++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java 2008-06-04 13:18:18 UTC (rev 7339)
@@ -23,12 +23,15 @@
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.ComposableRuntime;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
import org.jboss.wsf.spi.invocation.InvocationHandlerFactory;
import org.jboss.wsf.spi.invocation.RequestHandlerFactory;
import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.transport.TransportManagerFactory;
/**
@@ -50,6 +53,8 @@
private TransportManagerFactory transportManagerFactory;
+ boolean initialized;
+
public String getRuntimeName()
{
return runtimeName;
@@ -65,21 +70,37 @@
public void create(Deployment deployment)
{
+ init();
deploymentManager.create(deployment, this);
}
+ private void init()
+ {
+ if(!initialized)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ setEndpointRegistry( spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry() );
+ setRequestHandlerFactory( spiProvider.getSPI(RequestHandlerFactory.class) );
+ setInvocationHandlerFactory( spiProvider.getSPI(InvocationHandlerFactory.class) );
+ initialized = true;
+ }
+ }
+
public void start(Deployment deployment)
{
+ init();
deploymentManager.start(deployment, this);
}
public void stop(Deployment deployment)
{
+ init();
deploymentManager.stop(deployment, this);
}
public void destroy(Deployment deployment)
{
+ init();
deploymentManager.destroy(deployment, this);
}
@@ -89,7 +110,7 @@
public void setTransportManagerFactory(TransportManagerFactory factory)
{
assert factory!=null;
- log.debug(runtimeName + " -> TransportManagerFactory: " + factory);
+ log.info(runtimeName + " -> TransportManagerFactory: " + factory);
this.transportManagerFactory = factory;
}
@@ -101,7 +122,7 @@
public void setEndpointRegistry(EndpointRegistry endpointRegistry)
{
assert endpointRegistry!=null;
- log.debug(runtimeName + " -> EndpointRegistry: " + endpointRegistry);
+ log.info(runtimeName + " -> EndpointRegistry: " + endpointRegistry);
this.endpointRegistry = endpointRegistry;
}
@@ -113,7 +134,7 @@
public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager)
{
assert deploymentManager!=null;
- log.debug(runtimeName + " -> DeploymentAspectManager: " + deploymentManager);
+ log.info(runtimeName + " -> DeploymentAspectManager: " + deploymentManager);
this.deploymentManager = deploymentManager;
}
@@ -125,7 +146,7 @@
public void setRequestHandlerFactory(RequestHandlerFactory factory)
{
assert factory!=null;
- log.debug(runtimeName + " -> RequestHandlerFactory: "+ factory);
+ log.info(runtimeName + " -> RequestHandlerFactory: "+ factory);
this.requestHandlerFactory = factory;
}
17 years, 10 months
JBossWS SVN: r7338 - in container/jboss50/branches/jbossws-jboss501: src/main/java/org/jboss/wsf/container/jboss50/transport and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-04 09:12:59 -0400 (Wed, 04 Jun 2008)
New Revision: 7338
Modified:
container/jboss50/branches/jbossws-jboss501/pom.xml
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java
Log:
JBWS-2202: Container integration has a dpendency on framework
Modified: container/jboss50/branches/jbossws-jboss501/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/pom.xml 2008-06-04 13:09:31 UTC (rev 7337)
+++ container/jboss50/branches/jbossws-jboss501/pom.xml 2008-06-04 13:12:59 UTC (rev 7338)
@@ -91,14 +91,7 @@
<!-- Dependencies -->
<dependencies>
-
- <!-- FIXME: Remove this dependency -->
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-framework</artifactId>
- <version>3.0.2-SNAPSHOT</version>
- </dependency>
-
+
<!-- jbossws dependencies -->
<dependency>
<groupId>org.jboss.ws</groupId>
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-06-04 13:09:31 UTC (rev 7337)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java 2008-06-04 13:12:59 UTC (rev 7338)
@@ -23,7 +23,7 @@
import org.jboss.logging.Logger;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.wsf.framework.transport.HttpListenerRef;
+import org.jboss.wsf.spi.transport.HttpListenerRef;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-06-04 13:09:31 UTC (rev 7337)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java 2008-06-04 13:12:59 UTC (rev 7338)
@@ -30,7 +30,6 @@
import org.jboss.logging.Logger;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifier;
-import org.jboss.wsf.framework.transport.HttpListenerRef;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -38,16 +37,13 @@
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
-import org.jboss.wsf.spi.transport.HttpSpec;
-import org.jboss.wsf.spi.transport.ListenerRef;
-import org.jboss.wsf.spi.transport.TransportManager;
-import org.jboss.wsf.spi.transport.TransportSpec;
+import org.jboss.wsf.spi.transport.*;
import javax.xml.ws.WebServiceException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java 2008-06-04 13:09:31 UTC (rev 7337)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java 2008-06-04 13:12:59 UTC (rev 7338)
@@ -21,7 +21,7 @@
*/
package org.jboss.wsf.container.jboss50.transport;
-import org.jboss.wsf.framework.transport.HttpListenerRef;
+import org.jboss.wsf.spi.transport.HttpListenerRef;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
17 years, 10 months
JBossWS SVN: r7337 - stack/metro/trunk/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-04 09:09:31 -0400 (Wed, 04 Jun 2008)
New Revision: 7337
Modified:
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build-setup.xml
Log:
Move jboss.server.instance to target.properties
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-06-04 13:07:52 UTC (rev 7336)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-06-04 13:09:31 UTC (rev 7337)
@@ -32,8 +32,10 @@
<!-- ================================================================== -->
<target name="target-jboss422">
+ <property name="jboss.server.instance" value="default"/>
<property name="jbossws.integration.target" value="jboss422"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ <echo message="jboss.server.instance=${jboss.server.instance}" file="${target.properties.file}" append="true"/>
</target>
<target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422">
@@ -54,8 +56,10 @@
<!-- ================================================================== -->
<target name="target-jboss423">
+ <property name="jboss.server.instance" value="default"/>
<property name="jbossws.integration.target" value="jboss423"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ <echo message="jboss.server.instance=${jboss.server.instance}" file="${target.properties.file}" append="true"/>
</target>
<target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
@@ -90,8 +94,10 @@
<!-- ================================================================== -->
<target name="target-jboss500">
+ <property name="jboss.server.instance" value="default"/>
<property name="jbossws.integration.target" value="jboss500"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ <echo message="jboss.server.instance=${jboss.server.instance}" file="${target.properties.file}" append="true"/>
</target>
<target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
@@ -114,8 +120,10 @@
<!-- ================================================================== -->
<target name="target-jboss501">
+ <property name="jboss.server.instance" value="default"/>
<property name="jbossws.integration.target" value="jboss501"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ <echo message="jboss.server.instance=${jboss.server.instance}" file="${target.properties.file}" append="true"/>
</target>
<target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
Modified: stack/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml 2008-06-04 13:07:52 UTC (rev 7336)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2008-06-04 13:09:31 UTC (rev 7337)
@@ -21,7 +21,6 @@
<!-- Load jbossws.integration.target properties -->
<property file="${target.properties.file}"/>
- <property name="jboss.server.instance" value="default"/>
<property name="jboss422.lib" value="${jboss422.home}/lib"/>
<property name="jboss422.client" value="${jboss422.home}/client"/>
17 years, 10 months
JBossWS SVN: r7336 - in spi/trunk: src/main/java/org/jboss/wsf/spi/transport and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-04 09:07:52 -0400 (Wed, 04 Jun 2008)
New Revision: 7336
Added:
spi/trunk/src/main/java/org/jboss/wsf/spi/transport/HttpListenerRef.java
Modified:
spi/trunk/spi.iml
Log:
JBWS-2202: Container integration has a dpendency on framework
Modified: spi/trunk/spi.iml
===================================================================
--- spi/trunk/spi.iml 2008-06-04 13:05:13 UTC (rev 7335)
+++ spi/trunk/spi.iml 2008-06-04 13:07:52 UTC (rev 7336)
@@ -166,6 +166,33 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.xml.soap:saaj-api:jar:1.3:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.jws:jsr181-api:jar:1.0-MR1:provided">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/transport/HttpListenerRef.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/transport/HttpListenerRef.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/transport/HttpListenerRef.java 2008-06-04 13:07:52 UTC (rev 7336)
@@ -0,0 +1,68 @@
+/*
+ * 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.spi.transport;
+
+import java.net.URI;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class HttpListenerRef implements ListenerRef
+{
+ private String webContext;
+ private String urlPattern;
+ private URI address;
+
+ public HttpListenerRef(String webContext, String urlPattern, URI address)
+ {
+ if(!webContext.startsWith("/"))
+ webContext = "/"+webContext;
+
+ if(!urlPattern.startsWith("/"))
+ urlPattern = "/"+urlPattern;
+
+ this.webContext = webContext;
+ this.urlPattern = urlPattern;
+ this.address = address;
+ }
+
+ public Protocol getProtocol()
+ {
+ return Protocol.HTTP;
+ }
+
+ public URI getAddress()
+ {
+ return address;
+ }
+
+ public String getUUID()
+ {
+ return this.webContext+this.urlPattern;
+ }
+
+
+ public String toString()
+ {
+ return getAddress().toString();
+ }
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/transport/HttpListenerRef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 10 months
JBossWS SVN: r7335 - framework/trunk/src/main/java/org/jboss/wsf/framework/transport.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-04 09:05:13 -0400 (Wed, 04 Jun 2008)
New Revision: 7335
Removed:
framework/trunk/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java
Log:
JBWS-2202: Container integration has a dpendency on framework
Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java 2008-06-04 12:52:45 UTC (rev 7334)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java 2008-06-04 13:05:13 UTC (rev 7335)
@@ -1,71 +0,0 @@
-/*
- * 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.framework.transport;
-
-import org.jboss.wsf.spi.transport.ListenerRef;
-import org.jboss.wsf.spi.transport.Protocol;
-
-import java.net.URI;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class HttpListenerRef implements ListenerRef
-{
- private String webContext;
- private String urlPattern;
- private URI address;
-
- public HttpListenerRef(String webContext, String urlPattern, URI address)
- {
- if(!webContext.startsWith("/"))
- webContext = "/"+webContext;
-
- if(!urlPattern.startsWith("/"))
- urlPattern = "/"+urlPattern;
-
- this.webContext = webContext;
- this.urlPattern = urlPattern;
- this.address = address;
- }
-
- public Protocol getProtocol()
- {
- return Protocol.HTTP;
- }
-
- public URI getAddress()
- {
- return address;
- }
-
- public String getUUID()
- {
- return this.webContext+this.urlPattern;
- }
-
-
- public String toString()
- {
- return getAddress().toString();
- }
-}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java 2008-06-04 12:52:45 UTC (rev 7334)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/transport/HttpTransportManager.java 2008-06-04 13:05:13 UTC (rev 7335)
@@ -29,6 +29,7 @@
import org.jboss.wsf.spi.transport.HttpSpec;
import org.jboss.wsf.spi.transport.ListenerRef;
import org.jboss.wsf.spi.transport.TransportManager;
+import org.jboss.wsf.spi.transport.HttpListenerRef;
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
17 years, 10 months
JBossWS SVN: r7334 - spi/trunk/src/main/java/org/jboss/wsf/spi/tools.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-04 08:52:45 -0400 (Wed, 04 Jun 2008)
New Revision: 7334
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
Log:
Javadocs
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2008-06-04 12:17:33 UTC (rev 7333)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2008-06-04 12:52:45 UTC (rev 7334)
@@ -45,11 +45,11 @@
public static final String PROVIDER_PROPERTY = "org.jboss.wsf.spi.tools.ConsumerFactoryImpl";
/**
- * Obtain a new instance of a WSContractProvider. This will use the current
- * thread's context class loader to locate the WSContractProviderFactory
+ * Obtain a new instance of a WSContractConsumer. This will use the current
+ * thread's context class loader to locate the WSContractConsumerFactory
* implementation.
*
- * @return a new WSContractProvider
+ * @return a new WSContractConsumer
*/
public static WSContractConsumer newInstance()
{
17 years, 10 months
JBossWS SVN: r7333 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-04 08:17:33 -0400 (Wed, 04 Jun 2008)
New Revision: 7333
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java
Log:
[JBWS-2013] Implement standard message context properties
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2008-06-04 12:03:18 UTC (rev 7332)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2008-06-04 12:17:33 UTC (rev 7333)
@@ -71,26 +71,25 @@
MessageContext msgContext = (MessageContext)wsCtx.getMessageContext();
if (msgContext == null)
return "fail";
-
+
+ // Check standard jaxws properties
+ InputSource wsdlSource = (InputSource)msgContext.get(MessageContext.WSDL_DESCRIPTION);
QName service = (QName)msgContext.get(MessageContext.WSDL_SERVICE);
+ QName portType = (QName)msgContext.get(MessageContext.WSDL_INTERFACE);
+ QName port = (QName)msgContext.get(MessageContext.WSDL_PORT);
+ QName operation = (QName)msgContext.get(MessageContext.WSDL_OPERATION);
+
if (!service.equals(new QName("http://org.jboss.ws/jaxws/context", "EndpointService")))
throw new WebServiceException("Invalid qname: " + service);
-
- QName portType = (QName)msgContext.get(MessageContext.WSDL_INTERFACE);
if (!portType.equals(new QName("http://org.jboss.ws/jaxws/context", "Endpoint")))
throw new WebServiceException("Invalid qname: " + portType);
-
- QName port = (QName)msgContext.get(MessageContext.WSDL_PORT);
if (!port.equals(new QName("http://org.jboss.ws/jaxws/context", "EndpointPort")))
throw new WebServiceException("Invalid qname: " + port);
-
- QName operation = (QName)msgContext.get(MessageContext.WSDL_OPERATION);
if (!operation.equals(new QName("http://org.jboss.ws/jaxws/context", "testMessageContextProperties")))
throw new WebServiceException("Invalid qname: " + operation);
try
{
- InputSource wsdlSource = (InputSource)msgContext.get(MessageContext.WSDL_DESCRIPTION);
Element root = DOMUtils.parse(wsdlSource);
new DOMWriter(System.out).setPrettyprint(true).print(root);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java 2008-06-04 12:03:18 UTC (rev 7332)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java 2008-06-04 12:17:33 UTC (rev 7333)
@@ -62,25 +62,24 @@
if (msgContext == null)
return "fail";
+ // Check standard jaxws properties
+ InputSource wsdlSource = (InputSource)msgContext.get(MessageContext.WSDL_DESCRIPTION);
QName service = (QName)msgContext.get(MessageContext.WSDL_SERVICE);
+ QName portType = (QName)msgContext.get(MessageContext.WSDL_INTERFACE);
+ QName port = (QName)msgContext.get(MessageContext.WSDL_PORT);
+ QName operation = (QName)msgContext.get(MessageContext.WSDL_OPERATION);
+
if (!service.equals(new QName("http://org.jboss.ws/jaxws/context", "EndpointService")))
throw new WebServiceException("Invalid qname: " + service);
-
- QName portType = (QName)msgContext.get(MessageContext.WSDL_INTERFACE);
if (!portType.equals(new QName("http://org.jboss.ws/jaxws/context", "Endpoint")))
throw new WebServiceException("Invalid qname: " + portType);
-
- QName port = (QName)msgContext.get(MessageContext.WSDL_PORT);
if (!port.equals(new QName("http://org.jboss.ws/jaxws/context", "EndpointPort")))
throw new WebServiceException("Invalid qname: " + port);
-
- QName operation = (QName)msgContext.get(MessageContext.WSDL_OPERATION);
if (!operation.equals(new QName("http://org.jboss.ws/jaxws/context", "testMessageContextProperties")))
throw new WebServiceException("Invalid qname: " + operation);
try
{
- InputSource wsdlSource = (InputSource)msgContext.get(MessageContext.WSDL_DESCRIPTION);
Element root = DOMUtils.parse(wsdlSource);
new DOMWriter(System.out).setPrettyprint(true).print(root);
}
17 years, 10 months
JBossWS SVN: r7332 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-04 08:03:18 -0400 (Wed, 04 Jun 2008)
New Revision: 7332
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
Log:
Exclude jbws1840 because of @SecurityDomain
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-04 12:01:55 UTC (rev 7331)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-04 12:03:18 UTC (rev 7332)
@@ -13,7 +13,7 @@
# [JBAS-5055] Failed to load users/passwords/role files
org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.*
-org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.*
+org/jboss/test/ws/jaxws/jbws1840/**
org/jboss/test/ws/jaxws/samples/dar/**
# [JBAS-5114] MessageDriven EJB3 does not create destination automatically
17 years, 10 months
JBossWS SVN: r7331 - in framework/trunk/testsuite/test: resources/jaxws/samples/context/WEB-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-04 08:01:55 -0400 (Wed, 04 Jun 2008)
New Revision: 7331
Removed:
framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/Endpoint.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java
Log:
[JBWS-2013] Implement standard message context properties
Add seperate test. Add FIXMEs for CXF & Metro
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/Endpoint.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/Endpoint.java 2008-06-04 10:44:28 UTC (rev 7330)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/Endpoint.java 2008-06-04 12:01:55 UTC (rev 7331)
@@ -1,6 +1,28 @@
-
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.test.ws.jaxws.samples.context;
+// $Id$
+
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
@@ -8,46 +30,24 @@
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
-
-/**
- * This class was generated by the JAXWS SI.
- * JAX-WS RI 2.0-b26-ea3
- * Generated source version: 2.0
- *
- */
@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/context")
@SOAPBinding(style = Style.RPC)
public interface Endpoint {
-
- /**
- *
- * @return
- * returns java.lang.String
- */
@WebMethod
@WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return")
public String testGetMessageContext();
- /**
- *
- * @return
- * returns java.lang.String
- */
@WebMethod
@WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return")
+ public String testMessageContextProperties();
+
+ @WebMethod
+ @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return")
public String testGetUserPrincipal();
- /**
- *
- * @param arg0
- * @return
- * returns boolean
- */
@WebMethod
@WebResult(targetNamespace = "http://org.jboss.ws/jaxws/context", partName = "return")
- public boolean testIsUserInRole(
- @WebParam(name = "arg0", partName = "arg0")
- String arg0);
+ public boolean testIsUserInRole(@WebParam(name = "arg0", partName = "arg0") String arg0);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2008-06-04 10:44:28 UTC (rev 7330)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2008-06-04 12:01:55 UTC (rev 7331)
@@ -62,6 +62,13 @@
public String testGetMessageContext()
{
MessageContext msgContext = (MessageContext)wsCtx.getMessageContext();
+ return msgContext == null ? "fail" : "pass";
+ }
+
+ @WebMethod
+ public String testMessageContextProperties()
+ {
+ MessageContext msgContext = (MessageContext)wsCtx.getMessageContext();
if (msgContext == null)
return "fail";
@@ -78,7 +85,7 @@
throw new WebServiceException("Invalid qname: " + port);
QName operation = (QName)msgContext.get(MessageContext.WSDL_OPERATION);
- if (!operation.equals(new QName("http://org.jboss.ws/jaxws/context", "testGetMessageContext")))
+ if (!operation.equals(new QName("http://org.jboss.ws/jaxws/context", "testMessageContextProperties")))
throw new WebServiceException("Invalid qname: " + operation);
try
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java 2008-06-04 10:44:28 UTC (rev 7330)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointJSE.java 2008-06-04 12:01:55 UTC (rev 7331)
@@ -52,25 +52,32 @@
public String testGetMessageContext()
{
MessageContext msgContext = (MessageContext)wsCtx.getMessageContext();
+ return msgContext == null ? "fail" : "pass";
+ }
+
+ @WebMethod
+ public String testMessageContextProperties()
+ {
+ MessageContext msgContext = (MessageContext)wsCtx.getMessageContext();
if (msgContext == null)
return "fail";
-
+
QName service = (QName)msgContext.get(MessageContext.WSDL_SERVICE);
if (!service.equals(new QName("http://org.jboss.ws/jaxws/context", "EndpointService")))
throw new WebServiceException("Invalid qname: " + service);
-
+
QName portType = (QName)msgContext.get(MessageContext.WSDL_INTERFACE);
if (!portType.equals(new QName("http://org.jboss.ws/jaxws/context", "Endpoint")))
throw new WebServiceException("Invalid qname: " + portType);
-
+
QName port = (QName)msgContext.get(MessageContext.WSDL_PORT);
if (!port.equals(new QName("http://org.jboss.ws/jaxws/context", "EndpointPort")))
throw new WebServiceException("Invalid qname: " + port);
-
+
QName operation = (QName)msgContext.get(MessageContext.WSDL_OPERATION);
- if (!operation.equals(new QName("http://org.jboss.ws/jaxws/context", "testGetMessageContext")))
+ if (!operation.equals(new QName("http://org.jboss.ws/jaxws/context", "testMessageContextProperties")))
throw new WebServiceException("Invalid qname: " + operation);
-
+
try
{
InputSource wsdlSource = (InputSource)msgContext.get(MessageContext.WSDL_DESCRIPTION);
@@ -81,7 +88,7 @@
{
throw new WebServiceException("Cannot parse MessageContext.WSDL_DESCRIPTION", ex);
}
-
+
return "pass";
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2008-06-04 10:44:28 UTC (rev 7330)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2008-06-04 12:01:55 UTC (rev 7331)
@@ -54,7 +54,7 @@
{
if (port == null)
{
- URL wsdlURL = getResourceURL("jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-context?wsdl");
QName qname = new QName("http://org.jboss.ws/jaxws/context", "EndpointService");
Service service = Service.create(wsdlURL, qname);
port = (Endpoint)service.getPort(Endpoint.class);
@@ -71,6 +71,24 @@
assertEquals("pass", retStr);
}
+ public void testMessageContextProperties() throws Exception
+ {
+ if (isIntegrationMetro())
+ {
+ System.out.println("FIXME: [2204] Implement Metro standard message context properties");
+ return;
+ }
+
+ if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [2203] Implement CXF standard message context properties");
+ return;
+ }
+
+ String retStr = port.testMessageContextProperties();
+ assertEquals("pass", retStr);
+ }
+
public void testGetUserPrincipal() throws Exception
{
String retStr = port.testGetUserPrincipal();
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2008-06-04 10:44:28 UTC (rev 7330)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2008-06-04 12:01:55 UTC (rev 7331)
@@ -54,7 +54,7 @@
{
if (port == null)
{
- URL wsdlURL = getResourceURL("jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-context?wsdl");
QName qname = new QName("http://org.jboss.ws/jaxws/context", "EndpointService");
Service service = Service.create(wsdlURL, qname);
port = (Endpoint)service.getPort(Endpoint.class);
@@ -71,6 +71,24 @@
assertEquals("pass", retStr);
}
+ public void testMessageContextProperties() throws Exception
+ {
+ if (isIntegrationMetro())
+ {
+ System.out.println("FIXME: [2204] Implement Metro standard message context properties");
+ return;
+ }
+
+ if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [2203] Implement CXF standard message context properties");
+ return;
+ }
+
+ String retStr = port.testMessageContextProperties();
+ assertEquals("pass", retStr);
+ }
+
public void testGetUserPrincipal() throws Exception
{
String retStr = port.testGetUserPrincipal();
17 years, 10 months
JBossWS SVN: r7330 - container/jboss50/branches/jbossws-jboss500.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-04 06:44:28 -0400 (Wed, 04 Jun 2008)
New Revision: 7330
Modified:
container/jboss50/branches/jbossws-jboss500/pom.xml
Log:
restore dependency on jboss-vfs
Modified: container/jboss50/branches/jbossws-jboss500/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss500/pom.xml 2008-06-04 10:23:04 UTC (rev 7329)
+++ container/jboss50/branches/jbossws-jboss500/pom.xml 2008-06-04 10:44:28 UTC (rev 7330)
@@ -23,6 +23,7 @@
<jboss.ejb3.version>0.1.2.Beta1</jboss.ejb3.version>
<jboss.security.version>2.0.2.Beta4</jboss.security.version>
+ <jboss.vfs.version>2.0.0.Beta9</jboss.vfs.version>
<jboss.jbossxb.version>2.0.0.CR5</jboss.jbossxb.version>
<jboss.microcontainer.version>2.0.0.Beta10</jboss.microcontainer.version>
</properties>
@@ -50,6 +51,11 @@
<dependency>
<groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${jboss.vfs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<version>${jboss.jbossxb.version}</version>
</dependency>
@@ -127,6 +133,11 @@
<!-- Transitive compile dependencies -->
<dependency>
<groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<scope>compile</scope>
</dependency>
17 years, 10 months