JBossWS SVN: r6931 - in stack/cxf/trunk: modules/client and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-05-07 08:14:50 -0400 (Wed, 07 May 2008)
New Revision: 6931
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
Log:
fix ClassNotFoundExceptions
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2008-05-07 11:39:59 UTC (rev 6930)
+++ stack/cxf/trunk/modules/client/pom.xml 2008-05-07 12:14:50 UTC (rev 6931)
@@ -37,6 +37,18 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-object</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-coloc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
</dependency>
<dependency>
@@ -53,6 +65,10 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2008-05-07 11:39:59 UTC (rev 6930)
+++ stack/cxf/trunk/modules/server/pom.xml 2008-05-07 12:14:50 UTC (rev 6931)
@@ -58,6 +58,18 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-object</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-coloc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
</dependency>
<dependency>
@@ -74,6 +86,10 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-05-07 11:39:59 UTC (rev 6930)
+++ stack/cxf/trunk/pom.xml 2008-05-07 12:14:50 UTC (rev 6931)
@@ -174,6 +174,21 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-http</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-object</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-coloc</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
@@ -194,6 +209,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
<version>${cxf.version}</version>
</dependency>
16 years, 7 months
- 1
- 0
JBossWS SVN: r6930 - in container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50: deployment/metadata and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-07 07:39:59 -0400 (Wed, 07 May 2008)
New Revision: 6930
Modified:
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java
Log:
Fix NPE in JAXRPC deployments
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java 2008-05-07 10:38:05 UTC (rev 6929)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java 2008-05-07 11:39:59 UTC (rev 6930)
@@ -32,6 +32,7 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
@@ -70,9 +71,14 @@
if (wsMetaData == null)
throw new IllegalStateException("Deployment unit does not contain webservices meta data");
+ WebServiceDeployment webServiceDeployment = unit.getAttachment(WebServiceDeployment.class);
+ if (webServiceDeployment == null)
+ throw new IllegalStateException("Deployment unit does not contain webServiceDeployment");
+
// Copy the attachments
dep.addAttachment(WebservicesMetaData.class, wsMetaData);
dep.addAttachment(JBossMetaData.class, jbmd);
+ dep.addAttachment(WebServiceDeployment.class, webServiceDeployment);
for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
{
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java 2008-05-07 10:38:05 UTC (rev 6929)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java 2008-05-07 11:39:59 UTC (rev 6930)
@@ -24,12 +24,12 @@
//$Id$
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
import org.jboss.wsf.spi.transport.HttpSpec;
@@ -87,7 +87,7 @@
}
// EJB3 endpoints
- else if (unit.getAttachment(WebServiceDeployment.class) != null)
+ else if (unit.getAttachment(Ejb3Deployment.class) != null)
{
EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB3.buildMetaData(dep, unit);
if (ejbMetaData != null)
16 years, 7 months
- 1
- 0
JBossWS SVN: r6929 - container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-07 06:38:05 -0400 (Wed, 07 May 2008)
New Revision: 6929
Modified:
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java
Log:
Switch to debug logging
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java 2008-05-07 08:51:18 UTC (rev 6928)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java 2008-05-07 10:38:05 UTC (rev 6929)
@@ -89,7 +89,7 @@
public void setTransportManagerFactory(TransportManagerFactory factory)
{
assert factory!=null;
- log.info(runtimeName + " -> TransportManagerFactory: " + factory);
+ log.debug(runtimeName + " -> TransportManagerFactory: " + factory);
this.transportManagerFactory = factory;
}
@@ -101,7 +101,7 @@
public void setEndpointRegistry(EndpointRegistry endpointRegistry)
{
assert endpointRegistry!=null;
- log.info(runtimeName + " -> EndpointRegistry: " + endpointRegistry);
+ log.debug(runtimeName + " -> EndpointRegistry: " + endpointRegistry);
this.endpointRegistry = endpointRegistry;
}
@@ -113,7 +113,7 @@
public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager)
{
assert deploymentManager!=null;
- log.info(runtimeName + " -> DeploymentAspectManager: " + deploymentManager);
+ log.debug(runtimeName + " -> DeploymentAspectManager: " + deploymentManager);
this.deploymentManager = deploymentManager;
}
@@ -125,7 +125,7 @@
public void setRequestHandlerFactory(RequestHandlerFactory factory)
{
assert factory!=null;
- log.info(runtimeName + " -> RequestHandlerFactory: "+ factory);
+ log.debug(runtimeName + " -> RequestHandlerFactory: "+ factory);
this.requestHandlerFactory = factory;
}
@@ -138,7 +138,7 @@
public void setInvocationHandlerFactory(InvocationHandlerFactory factory)
{
assert factory!=null;
- log.info(runtimeName + " -> InvocationHandlerFactory: "+ factory);
+ log.debug(runtimeName + " -> InvocationHandlerFactory: "+ factory);
this.invocationHandlerFactory = factory;
}
16 years, 7 months
- 1
- 0
JBossWS SVN: r6928 - in spi/trunk: src/main/java/org/jboss/wsf/spi/deployment/integration and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-07 04:51:18 -0400 (Wed, 07 May 2008)
New Revision: 6928
Modified:
spi/trunk/spi.iml
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java
Log:
Added container names
Modified: spi/trunk/spi.iml
===================================================================
--- spi/trunk/spi.iml 2008-05-07 08:01:32 UTC (rev 6927)
+++ spi/trunk/spi.iml 2008-05-07 08:51:18 UTC (rev 6928)
@@ -14,51 +14,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.1.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: jboss:jboss-common-logging-spi:jar:2.0.4.GA:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: oswego-concurrent:concurrent:jar:1.3.4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: junit:junit:jar:3.8.1:test">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
@@ -68,88 +23,61 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: ant:ant-junit:jar:1.6.5:compile">
+ <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss:jboss-test:jar:1.0.4.GA:compile">
+ <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: apache-xerces:xml-apis:jar:2.7.1:compile">
+ <library name="M2 Dep: gnu-getopt:getopt:jar:1.0.13:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: jboss.common:jboss-common:jar:1.2.1.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: jboss:jboss-logging-spi:jar:2.0.3.GA:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: apache-httpclient:commons-httpclient:jar:2.0.2:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile">
- <CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:compile">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:test">
- <CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.activation:activation:jar:1.1:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.activation:activation:jar:1.1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" />
</CLASSES>
@@ -157,125 +85,71 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.microcontainer:jboss-dependency:jar:2.0.0.Beta4:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jboss.microcontainer:jboss-microcontainer:jar:1.0.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta4/jboss-dependency-2.0.0.Beta4.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/microcontainer/jboss-microcontainer/1.0.2/jboss-microcontainer-1.0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: apache-slide:webdavlib:jar:2.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: apache-slide:webdavlib:jar:2.0:compile">
- <CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/apache-slide/webdavlib/2.0/webdavlib-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: jboss:jboss-common-core:jar:2.0.4.GA:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: jboss:jboss-common-logging-log4j:jar:2.0.4.GA:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: wutka-dtdparser:dtdparser121:jar:1.2.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.microcontainer:jboss-container:jar:2.0.0.Beta4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/microcontainer/jboss-container/2.0.0.Beta4/jboss-container-2.0.0.Beta4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: jboss.profiler.jvmti:jboss-profiler-jvmti:jar:1.0.0.CR5:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: wutka-dtdparser:dtdparser121:jar:1.2.1:compile">
- <CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss:jbossxb:jar:2.0.0.CR4:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.jboss:jbossxb:jar:1.0.0.SP1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/jbossxb/1.0.0.SP1/jbossxb-1.0.0.SP1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss:javassist:jar:3.6-beta:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/javassist/3.6-beta/javassist-3.6-beta.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: gnu-getopt:getopt:jar:1.0.13:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: apache-xerces:xercesImpl:jar:2.7.1:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: ant:ant:jar:1.6.5:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/ant/ant/1.6.5/ant-1.6.5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: apache-xerces:xercesImpl:jar:2.7.1:compile">
- <CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:test">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:compile">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
</CLASSES>
@@ -283,8 +157,8 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
</CLASSES>
@@ -292,8 +166,8 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: javax.xml.ws:jaxws-api:jar:2.1:compile">
+ <orderEntry type="module-library">
+ <library name="M2 Dep: javax.xml.ws:jaxws-api:jar:2.1:provided">
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar!/" />
</CLASSES>
@@ -301,15 +175,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library name="M2 Dep: org.jboss.microcontainer:jboss-kernel:jar:2.0.0.Beta4:compile">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta4/jboss-kernel-2.0.0.Beta4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java 2008-05-07 08:01:32 UTC (rev 6927)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java 2008-05-07 08:51:18 UTC (rev 6928)
@@ -29,13 +29,21 @@
public interface WebServiceDeclaration
{
/**
- * Web service endpoint impl. name
+ * A distinct identifier across deployments.<br>
+ * In case of EJB3 this would be the <code>ObjectName</code> under which get's registered with the MC.
+ * @return
+ */
+ String getContainerName();
+
+ /**
+ * An identifier within a deployment.
+ * In case of EJB3 this would be the <code>ejb-name</code>.
* @return a name, that can be used to susequently address the service impl.
*/
String getComponentName();
/**
- * Web sevice endpoint impl. class
+ * Web service endpoint implementation class
* @return
*/
String getComponentClassName();
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java 2008-05-07 08:01:32 UTC (rev 6927)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java 2008-05-07 08:51:18 UTC (rev 6928)
@@ -31,9 +31,15 @@
public interface ServiceEndpointContainer
{
/**
- * The actualk web service implementation hosted by this container.
+ * Identifies a service endpoint container
* @return
*/
+ String getContainerName();
+
+ /**
+ * The actual web service implementation hosted by this container.
+ * @return
+ */
Class getServiceImplementationClass();
/**
16 years, 7 months
- 1
- 0
JBossWS SVN: r6927 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-07 04:01:32 -0400 (Wed, 07 May 2008)
New Revision: 6927
Modified:
stack/metro/trunk/modules/testsuite/pom.xml
Log:
Add jnpserver.jar to test classpath
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2008-05-07 07:21:44 UTC (rev 6926)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-05-07 08:01:32 UTC (rev 6927)
@@ -231,6 +231,11 @@
<version>${jboss.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss423</artifactId>
</dependency>
@@ -264,6 +269,11 @@
<version>${jboss.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
</dependency>
@@ -297,6 +307,11 @@
<version>${jboss.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501</artifactId>
</dependency>
16 years, 7 months
- 1
- 0
JBossWS SVN: r6926 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-07 03:21:44 -0400 (Wed, 07 May 2008)
New Revision: 6926
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
java.protocol.handler.pkgs=org.jboss.virtual.protocol
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-07 07:18:44 UTC (rev 6925)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-05-07 07:21:44 UTC (rev 6926)
@@ -110,10 +110,18 @@
<!--argLine>${surefire.jdpw.args}</argLine-->
<systemProperties>
<property>
+ <name>build.testlog</name>
+ <value>${project.build.directory}/test-log</value>
+ </property>
+ <property>
<name>java.naming.provider.url</name>
<value>jnp://${jboss.bind.address}:1099</value>
</property>
<property>
+ <name>java.protocol.handler.pkgs</name>
+ <value>org.jboss.virtual.protocol</value>
+ </property>
+ <property>
<name>java.util.logging.manager</name>
<value>org.jboss.wsf.common.logging.JDKLogManager</value>
</property>
@@ -126,10 +134,6 @@
<value>${jbossws.integration.target}</value>
</property>
<property>
- <name>build.testlog</name>
- <value>${project.build.directory}/test-log</value>
- </property>
- <property>
<name>test.archive.directory</name>
<value>${project.build.directory}/test-libs</value>
</property>
16 years, 7 months
- 1
- 0
JBossWS SVN: r6925 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-07 03:18:44 -0400 (Wed, 07 May 2008)
New Revision: 6925
Modified:
stack/metro/trunk/modules/testsuite/pom.xml
Log:
java.protocol.handler.pkgs=org.jboss.virtual.protocol
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2008-05-07 07:13:45 UTC (rev 6924)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-05-07 07:18:44 UTC (rev 6925)
@@ -118,10 +118,18 @@
<!--argLine>${surefire.jdpw.args}</argLine-->
<systemProperties>
<property>
+ <name>build.testlog</name>
+ <value>${project.build.directory}/test-log</value>
+ </property>
+ <property>
<name>java.naming.provider.url</name>
<value>jnp://${jboss.bind.address}:1099</value>
</property>
<property>
+ <name>java.protocol.handler.pkgs</name>
+ <value>org.jboss.virtual.protocol</value>
+ </property>
+ <property>
<name>java.util.logging.manager</name>
<value>org.jboss.wsf.common.logging.JDKLogManager</value>
</property>
@@ -134,10 +142,6 @@
<value>${jbossws.integration.target}</value>
</property>
<property>
- <name>build.testlog</name>
- <value>${project.build.directory}/test-log</value>
- </property>
- <property>
<name>test.archive.directory</name>
<value>${project.build.directory}/test-libs</value>
</property>
16 years, 7 months
- 1
- 0
JBossWS SVN: r6924 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-07 03:13:45 -0400 (Wed, 07 May 2008)
New Revision: 6924
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
java.protocol.handler.pkgs=org.jboss.virtual.protocol
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-05-07 06:55:14 UTC (rev 6923)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-07 07:13:45 UTC (rev 6924)
@@ -108,10 +108,18 @@
<!--argLine>${surefire.jdpw.args}</argLine-->
<systemProperties>
<property>
+ <name>build.testlog</name>
+ <value>${project.build.directory}/test-log</value>
+ </property>
+ <property>
<name>java.naming.provider.url</name>
<value>jnp://${jboss.bind.address}:1099</value>
</property>
<property>
+ <name>java.protocol.handler.pkgs</name>
+ <value>org.jboss.virtual.protocol</value>
+ </property>
+ <property>
<name>java.util.logging.manager</name>
<value>org.jboss.wsf.common.logging.JDKLogManager</value>
</property>
@@ -124,10 +132,6 @@
<value>${jbossws.integration.target}</value>
</property>
<property>
- <name>build.testlog</name>
- <value>${project.build.directory}/test-log</value>
- </property>
- <property>
<name>test.archive.directory</name>
<value>${project.build.directory}/test-libs</value>
</property>
16 years, 7 months
- 1
- 0
JBossWS SVN: r6923 - in framework/trunk/hudson/hudson-home/jobs: AS-Tests-AS-4.2.2 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-07 02:55:14 -0400 (Wed, 07 May 2008)
New Revision: 6923
Modified:
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml
framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml
Log:
Fix AS-5.0.1 test
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2008-05-06 19:02:34 UTC (rev 6922)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.1/config.xml 2008-05-07 06:55:14 UTC (rev 6923)
@@ -25,7 +25,7 @@
#
cd $STACKNATIVE
cp profiles.xml.example profiles.xml
-ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss421
+ant $ENVIRONMENT clean deploy-jboss421
#
# start jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2008-05-06 19:02:34 UTC (rev 6922)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.2/config.xml 2008-05-07 06:55:14 UTC (rev 6923)
@@ -25,7 +25,7 @@
#
cd $STACKNATIVE
cp profiles.xml.example profiles.xml
-ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422
+ant $ENVIRONMENT clean deploy-jboss422
#
# start jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2008-05-06 19:02:34 UTC (rev 6922)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2.3/config.xml 2008-05-07 06:55:14 UTC (rev 6923)
@@ -25,7 +25,7 @@
#
cd $STACKNATIVE
cp profiles.xml.example profiles.xml
-ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423
+ant $ENVIRONMENT clean deploy-jboss423
#
# start jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2008-05-06 19:02:34 UTC (rev 6922)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.0/config.xml 2008-05-07 06:55:14 UTC (rev 6923)
@@ -25,7 +25,7 @@
#
cd $STACKNATIVE
cp profiles.xml.example profiles.xml
-ant $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500
+ant $ENVIRONMENT clean deploy-jboss500
#
# start jbossas
Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml 2008-05-06 19:02:34 UTC (rev 6922)
+++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0.1/config.xml 2008-05-07 06:55:14 UTC (rev 6923)
@@ -25,9 +25,7 @@
#
cd $STACKNATIVE
cp profiles.xml.example profiles.xml
-ant $ENVIRONMENT clean
-ant $ENVIRONMENT -Dforce.thirdparty.get=true thirdparty-get
-ant $ENVIRONMENT deploy-jboss501
+ant $ENVIRONMENT clean deploy-jboss500
#
# start jbossas
16 years, 7 months
- 1
- 0
JBossWS SVN: r6922 - in container/jboss50/branches/jbossws-jboss501: src/main/java/org/jboss/wsf/container/jboss50/deployer and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-05-06 15:02:34 -0400 (Tue, 06 May 2008)
New Revision: 6922
Removed:
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/ServiceEndpointContainerApiAdapter.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/WebServiceDeploymentApiAdapter.java
Modified:
container/jboss50/branches/jbossws-jboss501/pom.xml
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java
container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java
Log:
Remove EJB3 API adapter
Modified: container/jboss50/branches/jbossws-jboss501/pom.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/pom.xml 2008-05-06 16:19:53 UTC (rev 6921)
+++ container/jboss50/branches/jbossws-jboss501/pom.xml 2008-05-06 19:02:34 UTC (rev 6922)
@@ -24,7 +24,7 @@
<jboss.version>5.0.0-SNAPSHOT</jboss.version>
<jboss.ejb3.version>0.1.0-SNAPSHOT</jboss.ejb3.version>
<jboss.deployers.version>2.0.0-SNAPSHOT</jboss.deployers.version>
- <jboss.metadata.version>1.0.0.Beta10</jboss.metadata.version>
+ <jboss.metadata.version>1.0.0.Beta11</jboss.metadata.version>
<jboss.security.version>2.0.2.Beta7</jboss.security.version>
<jboss.jbossxb.version>2.0.0.CR8</jboss.jbossxb.version>
<jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2008-05-06 16:19:53 UTC (rev 6921)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2008-05-06 19:02:34 UTC (rev 6922)
@@ -23,15 +23,14 @@
// $Id$
-import java.util.LinkedList;
-import java.util.List;
-
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
-import org.jboss.wsf.container.jboss50.deployer.DeployerHook;
+import java.util.LinkedList;
+import java.util.List;
+
/**
* This deployer that calls the registered DeployerHooks
*
@@ -43,7 +42,7 @@
// provide logging
private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class);
- private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>();
+ protected List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>();
public void addDeployerHook(DeployerHook deployer)
{
@@ -60,14 +59,12 @@
@Override
public void internalDeploy(DeploymentUnit unit) throws DeploymentException
{
- for (DeployerHook deployer : deployerHooks)
- deployer.deploy(unit);
+ for (DeployerHook deployer : deployerHooks) deployer.deploy(unit);
}
@Override
public void internalUndeploy(DeploymentUnit unit)
{
- for (DeployerHook deployer : deployerHooks)
- deployer.undeploy(unit);
+ for (DeployerHook deployer : deployerHooks) deployer.undeploy(unit);
}
}
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java 2008-05-06 16:19:53 UTC (rev 6921)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java 2008-05-06 19:02:34 UTC (rev 6922)
@@ -25,16 +25,15 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.metadata.serviceref.VirtualFileAdaptor;
-import org.jboss.wsf.container.jboss50.ejb3.WebServiceDeploymentApiAdapter;
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.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.wsf.container.jboss50.invocation.InvocationHandlerEJB3;
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
@@ -65,15 +64,14 @@
Service service = dep.getService();
- Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
- if (ejb3Deployment == null)
- throw new IllegalStateException("Deployment unit does not contain ejb3 deployment");
+ WebServiceDeployment webServiceDeployment = unit.getAttachment(WebServiceDeployment.class);
+ if (webServiceDeployment == null)
+ throw new IllegalStateException("Deployment unit does not contain webServiceDeployment");
// Copy the attachments
- dep.addAttachment(Ejb3Deployment.class, ejb3Deployment);
+ dep.addAttachment(WebServiceDeployment.class, webServiceDeployment);
- WebServiceDeployment apiAdapter = WebServiceDeploymentApiAdapter.createInstance(ejb3Deployment);
- Iterator<WebServiceDeclaration> it = apiAdapter.getServiceEndpoints().iterator();
+ Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
while (it.hasNext())
{
WebServiceDeclaration container = it.next();
@@ -85,6 +83,12 @@
// Create the endpoint
Endpoint ep = newEndpoint(epBean);
ep.setShortName(ejbName);
+
+ String containName = container.getContainerName();
+ if(null==containName)
+ throw new IllegalArgumentException("Target container name not set");
+ ep.setProperty(InvocationHandlerEJB3.CONTAINER_NAME, containName);
+
service.addEndpoint(ep);
}
}
@@ -95,14 +99,13 @@
@Override
public boolean isWebServiceDeployment(DeploymentUnit unit)
{
- Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
- if (ejb3Deployment == null)
+ WebServiceDeployment webServiceDeployment = unit.getAttachment(WebServiceDeployment.class);
+ if (null == webServiceDeployment )
return false;
boolean isWebServiceDeployment = false;
- WebServiceDeployment apiAdapter = WebServiceDeploymentApiAdapter.createInstance(ejb3Deployment);
- Iterator<WebServiceDeclaration> it = apiAdapter.getServiceEndpoints().iterator();
+ Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
while (it.hasNext())
{
WebServiceDeclaration container = it.next();
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-05-06 16:19:53 UTC (rev 6921)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-05-06 19:02:34 UTC (rev 6922)
@@ -21,27 +21,152 @@
*/
package org.jboss.wsf.container.jboss50.deployer;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb.deployers.EjbDeployment;
-import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb.deployers.MergedJBossMetaDataDeployer;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.logging.Logger;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
//$Id$
/**
- * This web service deployer for EJB
- *
+ * This web service deployer for EJB. Adopts EJB deployments to
+ * {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration} an passes it to a chain of
+ * {@link org.jboss.wsf.container.jboss50.deployer.DeployerHook}'s.
+ *
* @author Thomas.Diesler(a)jboss.org
+ * @author Heiko.Braun(a)jboss.com
+ *
* @since 24-Apr-2007
*/
public class WebServiceDeployerEJB extends AbstractWebServiceDeployer
{
+ private static final Logger log = Logger.getLogger(WebServiceDeployerEJB.class);
+
public WebServiceDeployerEJB()
{
- // Output of the EJBDeployer
+ addInput(MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME);
+
addInput(EjbDeployment.class);
- // Output of the EJB3Deployer
- addInput(Ejb3Deployment.class);
+
// Input for the TomcatDeployer
addOutput(JBossWebMetaData.class);
+
+ addOutput(WebServiceDeployment.class);
+
}
+
+ @Override
+ public void internalDeploy(DeploymentUnit unit) throws DeploymentException
+ {
+ JBossMetaData beans = (JBossMetaData)unit.getAttachment(
+ MergedJBossMetaDataDeployer.EJB_MERGED_ATTACHMENT_NAME
+ );
+
+ if(beans!=null)
+ {
+ WebServiceDeploymentAdapter wsDeployment = new WebServiceDeploymentAdapter();
+ Iterator<JBossEnterpriseBeanMetaData> iterator = beans.getEnterpriseBeans().iterator();
+ while(iterator.hasNext())
+ {
+ JBossEnterpriseBeanMetaData ejb = iterator.next();
+ if(ejb.getEjbClass()!=null)
+ wsDeployment.getEndpoints().add( new WebServiceDeclarationAdapter(ejb, unit.getClassLoader()) );
+ else
+ log.warn("Ingore ejb deployment with null classname: " + ejb);
+ }
+
+ unit.addAttachment(WebServiceDeployment.class, wsDeployment);
+
+ super.internalDeploy(unit);
+ }
+ }
+
+ @Override
+ public void internalUndeploy(DeploymentUnit unit)
+ {
+ super.internalUndeploy(unit);
+ }
+
+ /**
+ * Adopts EJB3 bean meta data to a {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration}
+ */
+ private class WebServiceDeclarationAdapter implements WebServiceDeclaration
+ {
+
+ private JBossEnterpriseBeanMetaData ejbMetaData;
+ private ClassLoader loader;
+
+ public WebServiceDeclarationAdapter(JBossEnterpriseBeanMetaData ejbMetaData, ClassLoader loader)
+ {
+ this.ejbMetaData = ejbMetaData;
+ this.loader = loader;
+ }
+
+ public String getContainerName()
+ {
+ return ejbMetaData.determineContainerName();
+ }
+
+ public String getComponentName()
+ {
+ return ejbMetaData.getName();
+ }
+
+ public String getComponentClassName()
+ {
+ return ejbMetaData.getEjbClass();
+ }
+
+ public <T extends Annotation> T getAnnotation(Class<T> annotation)
+ {
+ Class bean = getComponentClass();
+ T result = null;
+ if(bean.isAnnotationPresent(annotation))
+ {
+ result = (T)bean.getAnnotation(annotation);
+ }
+
+ return result;
+ }
+
+ private Class getComponentClass()
+ {
+ try
+ {
+ return loader.loadClass(getComponentClassName());
+ } catch (ClassNotFoundException e)
+ {
+ throw new RuntimeException("Failed to load component class "+ getComponentClassName()+". Loader:" + this.loader);
+ }
+ }
+ }
+
+ /**
+ * Adopts an EJB deployment to a {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeployment}
+ */
+ private class WebServiceDeploymentAdapter implements WebServiceDeployment
+ {
+ private List<WebServiceDeclaration> endpoints = new ArrayList<WebServiceDeclaration>();
+
+ public List<WebServiceDeclaration> getServiceEndpoints()
+ {
+ return endpoints;
+ }
+
+ public List<WebServiceDeclaration> getEndpoints()
+ {
+ return endpoints;
+ }
+ }
}
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2008-05-06 16:19:53 UTC (rev 6921)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2008-05-06 19:02:34 UTC (rev 6922)
@@ -25,10 +25,10 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.WSFRuntime;
-import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
/**
* Determines the correct runtime loader for per deployment type
@@ -42,7 +42,7 @@
public void start(Deployment dep, WSFRuntime runtime)
{
// EJB3 endpoints
- if (dep.getAttachment(Ejb3Deployment.class) != null)
+ if (dep.getAttachment(WebServiceDeployment.class) != null)
{
dep.setRuntimeClassLoader(dep.getInitialClassLoader());
}
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java 2008-05-06 16:19:53 UTC (rev 6921)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java 2008-05-06 19:02:34 UTC (rev 6922)
@@ -24,12 +24,12 @@
//$Id$
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
import org.jboss.wsf.spi.transport.HttpSpec;
@@ -69,7 +69,7 @@
public void buildContainerMetaData(Deployment dep, DeploymentUnit unit)
{
dep.addAttachment(DeploymentUnit.class, unit);
-
+
try
{
// JSE endpoints
@@ -87,7 +87,7 @@
}
// EJB3 endpoints
- else if (unit.getAttachment(Ejb3Deployment.class) != null)
+ else if (unit.getAttachment(WebServiceDeployment.class) != null)
{
EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB3.buildMetaData(dep, unit);
if (ejbMetaData != null)
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java 2008-05-06 16:19:53 UTC (rev 6921)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java 2008-05-06 19:02:34 UTC (rev 6922)
@@ -24,19 +24,16 @@
// $Id$
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.logging.Logger;
import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
-import org.jboss.wsf.container.jboss50.ejb3.WebServiceDeploymentApiAdapter;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.j2ee.*;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData.PublishLocationAdapter;
-import org.jboss.wsf.spi.metadata.j2ee.PortComponentSpec;
-import org.jboss.ejb3.Ejb3Deployment;
import javax.ejb.ActivationConfigProperty;
import javax.ejb.MessageDriven;
@@ -59,10 +56,8 @@
{
EJBArchiveMetaData umd = new EJBArchiveMetaData();
- WebServiceDeployment apiAdapter = WebServiceDeploymentApiAdapter.createInstance(
- unit.getAttachment(Ejb3Deployment.class)
- );
- buildEnterpriseBeansMetaData(umd, apiAdapter);
+ WebServiceDeployment webServiceDeployment = dep.getAttachment(WebServiceDeployment.class);
+ buildEnterpriseBeansMetaData(umd, webServiceDeployment);
JBossMetaData jbMetaData = unit.getAttachment(JBossMetaData.class);
if (jbMetaData != null)
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java 2008-05-06 16:19:53 UTC (rev 6921)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java 2008-05-06 19:02:34 UTC (rev 6922)
@@ -23,15 +23,13 @@
//$Id$
-import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.annotation.SecurityDomain;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.wsf.container.jboss50.ejb3.WebServiceDeploymentApiAdapter;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
+import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import javax.annotation.security.RolesAllowed;
import java.util.Iterator;
@@ -48,11 +46,10 @@
{
String securityDomain = null;
- Ejb3Deployment ejb3Deployment = dep.getAttachment(Ejb3Deployment.class);
- if (ejb3Deployment != null)
+ WebServiceDeployment webServiceDeployment = dep.getAttachment(WebServiceDeployment.class);
+ if (webServiceDeployment != null)
{
- WebServiceDeployment apiAdapter = WebServiceDeploymentApiAdapter.createInstance(ejb3Deployment);
- Iterator<WebServiceDeclaration> it = apiAdapter.getServiceEndpoints().iterator();
+ Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
while (it.hasNext())
{
WebServiceDeclaration container = it.next();
@@ -78,11 +75,10 @@
public void addSecurityRoles(JBossWebMetaData webApp, Deployment dep)
{
- Ejb3Deployment ejb3Deployment = dep.getAttachment(Ejb3Deployment.class);
- if (ejb3Deployment != null)
+ WebServiceDeployment webServiceDeployment = dep.getAttachment(WebServiceDeployment.class);
+ if (webServiceDeployment != null)
{
- WebServiceDeployment apiAdapter = WebServiceDeploymentApiAdapter.createInstance(ejb3Deployment);
- Iterator<WebServiceDeclaration> it = apiAdapter.getServiceEndpoints().iterator();
+ Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
while (it.hasNext())
{
WebServiceDeclaration container = it.next();
Deleted: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/ServiceEndpointContainerApiAdapter.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/ServiceEndpointContainerApiAdapter.java 2008-05-06 16:19:53 UTC (rev 6921)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/ServiceEndpointContainerApiAdapter.java 2008-05-06 19:02:34 UTC (rev 6922)
@@ -1,110 +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.container.jboss50.ejb3;
-
-import org.jboss.ejb3.BeanContext;
-import org.jboss.ejb3.BeanContextLifecycleCallback;
-import org.jboss.ejb3.stateless.StatelessBeanContext;
-import org.jboss.ejb3.stateless.StatelessContainer;
-import org.jboss.injection.lang.reflect.BeanProperty;
-import org.jboss.wsf.spi.invocation.integration.InvocationContextCallback;
-import org.jboss.wsf.spi.invocation.integration.ServiceEndpointContainer;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext;
-import org.jboss.wsf.spi.invocation.InvocationType;
-import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
-
-import javax.ejb.EJBContext;
-import java.lang.reflect.Method;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class ServiceEndpointContainerApiAdapter implements ServiceEndpointContainer
-{
- private StatelessContainer ejb3Container;
-
- public static ServiceEndpointContainer createInstance(Object invocationTarget)
- {
- if(! (invocationTarget instanceof StatelessContainer) )
- throw new IllegalArgumentException("Unexpected invocation target: " + invocationTarget);
-
- return new ServiceEndpointContainerApiAdapter((StatelessContainer)invocationTarget);
- }
-
- ServiceEndpointContainerApiAdapter(StatelessContainer ejb3Container)
- {
- this.ejb3Container = ejb3Container;
- }
-
-
- public Class getServiceImplementationClass()
- {
- return ejb3Container.getBeanClass();
- }
-
- public Object invokeEndpoint(Method method, Object[] args, InvocationContextCallback invocationContextCallback)
- throws Throwable
- {
- CallbackImpl callback = new CallbackImpl(invocationContextCallback);
- return ejb3Container.localInvoke(method, args, null, callback);
- }
-
- static class CallbackImpl implements BeanContextLifecycleCallback
- {
- private javax.xml.ws.handler.MessageContext jaxwsMessageContext;
- private javax.xml.rpc.handler.MessageContext jaxrpcMessageContext;
-
- public CallbackImpl(InvocationContextCallback epInv)
- {
- jaxrpcMessageContext = epInv.get( javax.xml.rpc.handler.MessageContext.class );
- jaxwsMessageContext = epInv.get( javax.xml.ws.handler.MessageContext.class );
- }
-
- public void attached(BeanContext beanCtx)
- {
- StatelessBeanContext sbc = (StatelessBeanContext)beanCtx;
- sbc.setMessageContextJAXRPC(jaxrpcMessageContext);
-
- BeanProperty beanProp = sbc.getWebServiceContextProperty();
- if (beanProp != null)
- {
- EJBContext ejbCtx = beanCtx.getEJBContext();
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ExtensibleWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext);
- wsContext.addAttachment(EJBContext.class, ejbCtx);
- beanProp.set(beanCtx.getInstance(), wsContext);
- }
- }
-
- public void released(BeanContext beanCtx)
- {
- StatelessBeanContext sbc = (StatelessBeanContext)beanCtx;
- sbc.setMessageContextJAXRPC(null);
-
- BeanProperty beanProp = sbc.getWebServiceContextProperty();
- if (beanProp != null)
- beanProp.set(beanCtx.getInstance(), null);
- }
- }
-}
Deleted: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/WebServiceDeploymentApiAdapter.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/WebServiceDeploymentApiAdapter.java 2008-05-06 16:19:53 UTC (rev 6921)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/WebServiceDeploymentApiAdapter.java 2008-05-06 19:02:34 UTC (rev 6922)
@@ -1,94 +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.container.jboss50.ejb3;
-
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.EJBContainer;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- * Adopts the new WS-EJB3 API to legacy EJB3 codebase while the
- * EJB3 hasn't updated to the new integration interfaces.
- *
- * <p/>
- * TODO: This should be implemented by {@link org.jboss.ejb3.Ejb3Deployment}
- *
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class WebServiceDeploymentApiAdapter implements WebServiceDeployment
-{
- private Ejb3Deployment ejb3Deployment;
-
- public static WebServiceDeploymentApiAdapter createInstance(Ejb3Deployment ejb3Deployment)
- {
- if(null==ejb3Deployment)
- throw new IllegalArgumentException("Ejb3Deployment.class cannot be null");
-
- return new WebServiceDeploymentApiAdapter(ejb3Deployment);
- }
-
- private WebServiceDeploymentApiAdapter(Ejb3Deployment ejb3Deployment)
- {
- this.ejb3Deployment = ejb3Deployment;
- }
-
- public List<WebServiceDeclaration> getServiceEndpoints()
- {
- List<WebServiceDeclaration> container = new ArrayList<WebServiceDeclaration>();
-
- Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator();
- while(it.hasNext())
- {
- final EJBContainer c = (EJBContainer)it.next();
- container.add(
- new WebServiceDeclaration()
- {
-
- public <T extends java.lang.annotation.Annotation> T getAnnotation(Class<T> t)
- {
- return c.getAnnotation(t);
- }
-
-
- public String getComponentName()
- {
- return c.getEjbName();
- }
-
- public String getComponentClassName()
- {
- return c.getBeanClassName();
- }
- }
-
- );
- }
- return container;
-
- }
-}
\ No newline at end of file
Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java 2008-05-06 16:19:53 UTC (rev 6921)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java 2008-05-06 19:02:34 UTC (rev 6922)
@@ -24,17 +24,13 @@
// $Id$
import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.wsf.spi.invocation.integration.InvocationContextCallback;
-import org.jboss.wsf.spi.invocation.integration.ServiceEndpointContainer;
import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.container.jboss50.ejb3.ServiceEndpointContainerApiAdapter;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.integration.InvocationContextCallback;
+import org.jboss.wsf.spi.invocation.integration.ServiceEndpointContainer;
import org.jboss.wsf.spi.util.KernelLocator;
-import javax.management.ObjectName;
import javax.xml.ws.WebServiceException;
import java.lang.reflect.Method;
@@ -42,12 +38,18 @@
* Handles invocations on EJB3 endpoints.
*
* @author Thomas.Diesler(a)jboss.org
+ * @author Heiko.Braun(a)jboss.com
+ *
* @since 25-Apr-2007
*/
public class InvocationHandlerEJB3 extends AbstractInvocationHandler
{
- private ObjectName objectName;
+
+ public static final String CONTAINER_NAME = "org.jboss.wsf.spi.invocation.ContainerName";
+
+ private String containerName;
private KernelController houston;
+ private ServiceEndpointContainer invocationTarget;
InvocationHandlerEJB3()
{
@@ -61,34 +63,28 @@
public void init(Endpoint ep)
{
- String ejbName = ep.getShortName();
- ArchiveDeployment dep = (ArchiveDeployment)ep.getService().getDeployment();
- String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + dep.getSimpleName();
- if (dep.getParent() != null)
- {
- nameStr += ",ear=" + dep.getParent().getSimpleName();
- }
-
- objectName = ObjectNameFactory.create(nameStr.toString());
-
- if (houston.getInstalledContext( objectName.getCanonicalName() ) == null)
- throw new WebServiceException("Cannot find service endpoint target: " + objectName);
+ containerName = (String)ep.getProperty(InvocationHandlerEJB3.CONTAINER_NAME);
+ assert containerName!=null : "Target container name not set";
+
+ ControllerContext context = houston.getInstalledContext(containerName);
+ if (context == null)
+ throw new WebServiceException("Cannot find service endpoint target: " + containerName);
+
+ assert (context.getTarget() instanceof ServiceEndpointContainer) : "Invocation target mismatch";
+ this.invocationTarget = (ServiceEndpointContainer) context.getTarget();
}
public void invoke(Endpoint ep, Invocation wsInv) throws Exception
{
try
{
- ControllerContext context = houston.getInstalledContext(objectName.getCanonicalName());
- ServiceEndpointContainer apiAdapter = ServiceEndpointContainerApiAdapter.createInstance(context.getTarget());
-
- Class beanClass = apiAdapter.getServiceImplementationClass();
+ Class beanClass = invocationTarget.getServiceImplementationClass();
Method method = getImplMethod(beanClass, wsInv.getJavaMethod());
Object[] args = wsInv.getArgs();
InvocationContextCallback invProps = new EJB3InvocationContextCallback(wsInv);
+
+ Object retObj = invocationTarget.invokeEndpoint(method, args, invProps);
- Object retObj = apiAdapter.invokeEndpoint(method, args, invProps);
-
wsInv.setReturnValue(retObj);
}
catch (Throwable th)
@@ -111,4 +107,4 @@
return wsInv.getInvocationContext().getAttachment(propertyType);
}
}
-}
\ No newline at end of file
+}
16 years, 8 months
- 1
- 0