12:09 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2007-05-09 13:09:16 -0400 (Wed, 09 May 2007)
New Revision: 3019
Removed:
projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/PortComponentLinkServlet.java
Modified:
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java
projects/wsintegration/jbws-jboss42/trunk/.classpath
projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
projects/wsintegration/jbws-jboss50/trunk/build.xml
projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml
projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml
projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/DeploymentInfoAdapter.java
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml
Log:
Fix test regression
Modified:
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java
===================================================================
---
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java 2007-05-09
16:02:45 UTC (rev 3018)
+++
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/BasicEndpointRegistry.java 2007-05-09
17:09:16 UTC (rev 3019)
@@ -64,6 +64,7 @@
import javax.management.ObjectName;
import org.jboss.logging.Logger;
+import org.jboss.util.NotImplementedException;
import org.jboss.ws.integration.Endpoint;
/**
@@ -91,6 +92,11 @@
return endpoint;
}
+ public Endpoint resolvePortComponentLink(String pcLink)
+ {
+ throw new NotImplementedException();
+ }
+
public boolean isRegistered(ObjectName epName)
{
if (epName == null)
Modified:
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java
===================================================================
---
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java 2007-05-09
16:02:45 UTC (rev 3018)
+++
projects/wsintegration/jbossws-spi/trunk/src/main/java/org/jboss/ws/integration/management/EndpointRegistry.java 2007-05-09
17:09:16 UTC (rev 3019)
@@ -80,6 +80,9 @@
/** Get the registered endpoint */
Endpoint getEndpoint(ObjectName epName);
+ /** Resolve a port component link */
+ Endpoint resolvePortComponentLink(String pcLink);
+
/** True is an endpoint for that name is registered */
boolean isRegistered(ObjectName epName);
Modified: projects/wsintegration/jbws-jboss42/trunk/.classpath
===================================================================
--- projects/wsintegration/jbws-jboss42/trunk/.classpath 2007-05-09 16:02:45 UTC (rev
3018)
+++ projects/wsintegration/jbws-jboss42/trunk/.classpath 2007-05-09 17:09:16 UTC (rev
3019)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="org/jboss/ws/integration/jboss42/jms/"
kind="src" path="src/main/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src"
path="/jbossws-core"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
Deleted:
projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/PortComponentLinkServlet.java
===================================================================
---
projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/PortComponentLinkServlet.java 2007-05-09
16:02:45 UTC (rev 3018)
+++
projects/wsintegration/jbws-jboss42/trunk/src/main/java/org/jboss/ws/integration/jboss42/jbossws/PortComponentLinkServlet.java 2007-05-09
17:09:16 UTC (rev 3019)
@@ -1,93 +0,0 @@
-/*
- * 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.ws.integration.jboss42.jbossws;
-
-// $Id$
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.server.legacy.ServiceEndpoint;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManager;
-import org.jboss.ws.core.server.legacy.ServiceEndpointManagerFactory;
-
-/**
- * A servlet that reports the serviceURL for a given service ID.
- * <p/>
- * When the web service client ENC is setup, it may contain port-component-link
- * entries that point to service endpoints in the same top level deployment.
- * The final serviceURL of those endpoints will become available after the
- * reference to the javax.xml.rpc.Service is bound to JNDI.
- * <p/>
- * When the client does a lookup of the javax.xml.rpc.Service from JNDI the
ObjectFactory
- * will contact this servlet for the final serviceURL. It is acceptable that the client
- * wsdl does not contain the correct serviceURL if the client is using the
port-component-link element.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 29-May-2004
- */
-public class PortComponentLinkServlet extends HttpServlet
-{
- // provide logging
- private static final Logger log = Logger.getLogger(PortComponentLinkServlet.class);
-
- protected ServiceEndpointManager epManager;
-
- public void init(ServletConfig config) throws ServletException
- {
- super.init(config);
- ServiceEndpointManagerFactory factory =
ServiceEndpointManagerFactory.getInstance();
- epManager = factory.getServiceEndpointManager();
- }
-
- /**
- * Get the serviceURL as string for a given serviceID.
- */
- public void doGet(HttpServletRequest req, HttpServletResponse res) throws
ServletException, IOException
- {
- String pcLink = req.getParameter("pcLink");
- if (pcLink == null)
- throw new IllegalArgumentException("Cannot obtain request parameter
'pcLink'");
-
- ServiceEndpoint serviceEndpoint = epManager.resolvePortComponentLink(pcLink);
- ;
- if (serviceEndpoint == null)
- throw new WSException("Cannot resolve port-component-link: " +
pcLink);
-
- res.setContentType("text/plain");
- PrintWriter out = res.getWriter();
-
- String endpointAddress =
serviceEndpoint.getServiceEndpointInfo().getServerEndpointMetaData().getEndpointAddress();
- out.println(endpointAddress);
-
- log.debug("Resolved " + pcLink + " to: " + endpointAddress);
- out.close();
- }
-}
Modified:
projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
===================================================================
---
projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-09
16:02:45 UTC (rev 3018)
+++
projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-09
17:09:16 UTC (rev 3019)
@@ -1 +1 @@
-org.jboss.ws.integration.jboss42.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
+org.jboss.ws.integration.jboss42.jbossws.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
Modified: projects/wsintegration/jbws-jboss50/trunk/build.xml
===================================================================
--- projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-09 16:02:45 UTC (rev
3018)
+++ projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-09 17:09:16 UTC (rev
3019)
@@ -162,9 +162,11 @@
<include name="jbossws-context.war"/>
</fileset>
-->
+ <fileset dir="${thirdparty.dir}/jbossws-core">
+ <include name="jbossws-core.jar"/>
+ </fileset>
<fileset dir="${thirdparty.dir}">
<include name="policy.jar"/>
- <include name="jbossws-core.jar"/>
<include name="wsdl4j.jar"/>
<include name="xmlsec.jar"/>
</fileset>
@@ -178,7 +180,7 @@
<!-- Build jbossws50.deployer -->
<zip zipfile="${jboss50.output.lib.dir}/jbossws50-deployer.zip">
- <fileset dir="${thirdparty.dir}">
+ <fileset dir="${thirdparty.dir}/jbossws-spi">
<include name="jbossws-spi.jar"/>
</fileset>
<fileset dir="${jboss50.output.lib.dir}">
Modified:
projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml
===================================================================
---
projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-09
16:02:45 UTC (rev 3018)
+++
projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-09
17:09:16 UTC (rev 3019)
@@ -54,6 +54,8 @@
<delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<unjar
dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="${jboss50.output.lib.dir}/jbossws50.sar"/>
+
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy"
file="${jboss50.output.lib.dir}/jbossws-context.war"
overwrite="true"/>
</target>
</project>
Modified:
projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml
===================================================================
---
projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09
16:02:45 UTC (rev 3018)
+++
projects/wsintegration/jbws-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-09
17:09:16 UTC (rev 3019)
@@ -17,13 +17,45 @@
<!-- Libraries -->
<!-- ========= -->
- <target name="thirdparty"
depends="thirdparty-get,thirdparty-classpath">
+ <target name="thirdparty"
depends="jbossws-core-get,jbossws-spi-get,thirdparty-get,thirdparty-classpath">
</target>
+ <!--
+ jbossws-core-get
+ -->
+ <target name="jbossws-core-get" if="force.thirdparty.get"
+ description="Gets the jbossws-core libraries">
+
+ <mkdir dir="${thirdparty.dir}/jbossws-core"/>
+ <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar"
dest="${thirdparty.dir}/jbossws-core/jbossws-client.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-core.jar"
dest="${thirdparty.dir}/jbossws-core/jbossws-core.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-resources.zip"
dest="${thirdparty.dir}/jbossws-core/jbossws-resources.zip"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar"
dest="${thirdparty.dir}/jbossws-core/jboss-saaj.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar"
dest="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar"
usetimestamp="true" verbose="true"/>
+ <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar"
dest="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar"
usetimestamp="true" verbose="true"/>
+
+ <mkdir dir="${thirdparty.dir}/jbossws-resources"/>
+ <unzip dest="${thirdparty.dir}/jbossws-resources"
src="${thirdparty.dir}/jbossws-core/jbossws-resources.zip"/>
+
+ </target>
+
+ <!--
+ jbossws-spi-get
+ -->
+ <target name="jbossws-spi-get" if="force.thirdparty.get"
+ description="Gets the jbossws-core libraries">
+
+ <mkdir dir="${thirdparty.dir}/jbossws-spi"/>
+ <get
src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar"
dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"
usetimestamp="true" verbose="true"/>
+
+ </target>
+
+ <!--
+ thirdpartry-get
+ -->
<target name="thirdparty-get" if="force.thirdparty.get"
description="Gets the thirdparty libraries">
- <mkdir dir="${thirdparty.dir}"/>
<get
src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar"
dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar"
dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar"
dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true"
verbose="true"/>
@@ -32,13 +64,6 @@
<get
src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar"
dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar"
dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar"
dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar"
dest="${thirdparty.dir}/jbossws-client.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-core.jar"
dest="${thirdparty.dir}/jbossws-core.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-resources.zip"
dest="${thirdparty.dir}/jbossws-resources.zip" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar"
dest="${thirdparty.dir}/jboss-saaj.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar"
dest="${thirdparty.dir}/jboss-jaxrpc.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar"
dest="${thirdparty.dir}/jboss-jaxws.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar"
dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar"
dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar"
usetimestamp="true" verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar"
dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar"
dest="${thirdparty.dir}/jboss-xml-binding-sources.jar"
usetimestamp="true" verbose="true"/>
@@ -55,15 +80,19 @@
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar"
dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar"
dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar"
dest="${thirdparty.dir}/policy.jar" usetimestamp="true"
verbose="true"/>
-
- <mkdir dir="${thirdparty.dir}/jbossws-resources"/>
- <unzip dest="${thirdparty.dir}/jbossws-resources"
src="${thirdparty.dir}/jbossws-resources.zip"/>
</target>
<target name="thirdparty-classpath" >
<!-- The compile classpath for jboss50 integration -->
<path id="jboss50.integration.classpath">
+ <pathelement
location="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"/>
+
+ <pathelement
location="${thirdparty.dir}/jbossws-core/jbossws-core.jar"/>
+ <pathelement
location="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar"/>
+ <pathelement
location="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar"/>
+ <pathelement
location="${thirdparty.dir}/jbossws-core/jboss-saaj.jar"/>
+
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
@@ -82,15 +111,10 @@
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
<pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
<pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/>
<pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
<pathelement
location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/>
<pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-core.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
</path>
Modified:
projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/DeploymentInfoAdapter.java
===================================================================
---
projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/DeploymentInfoAdapter.java 2007-05-09
16:02:45 UTC (rev 3018)
+++
projects/wsintegration/jbws-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/DeploymentInfoAdapter.java 2007-05-09
17:09:16 UTC (rev 3019)
@@ -93,9 +93,5 @@
udi.metaData = WebMetaDataAdaptor.buildUnifiedWebMetaData(udi, unit);
udi.webappURL = udi.vfRoot.toURL();
}
- else
- {
- throw new IllegalStateException("Cannot build meta data");
- }
}
}
Modified:
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
===================================================================
---
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-09
16:02:45 UTC (rev 3018)
+++
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-09
17:09:16 UTC (rev 3019)
@@ -1 +1 @@
-org.jboss.ws.integration.jboss50.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
+org.jboss.ws.integration.jboss50.jbossws.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
Modified:
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml
===================================================================
---
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-09
16:02:45 UTC (rev 3018)
+++
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-09
17:09:16 UTC (rev 3019)
@@ -117,6 +117,7 @@
<inject bean="WSPublishContractDeployer"/>
<inject bean="WSClassLoaderInjectionDeployer"/>
<inject bean="WSEagerInitializeDeployer"/>
+ <inject bean="WSEventingDeployer"/>
<inject bean="WSEndpointRegistryDeployer"/>
<inject bean="WSEndpointLifecycleDeployer"/>
</list>
@@ -144,6 +145,7 @@
<bean name="WSEndpointLifecycleDeployer"
class="org.jboss.ws.core.deployment.EndpointLifecycleDeployer"/>
<bean name="WSEndpointNameDeployer"
class="org.jboss.ws.core.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer"
class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/>
+ <bean name="WSEventingDeployer"
class="org.jboss.ws.core.deployment.EventingDeployer"/>
<bean name="WSModifyWebMetaDataDeployer"
class="org.jboss.ws.integration.jboss50.jbossws.ModifyWebMetaDataDeployer">
<property name="serviceEndpointPublisher"><inject
bean="WSServiceEndpointPublisher"/></property>
</bean>
Modified:
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml
===================================================================
---
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml 2007-05-09
16:02:45 UTC (rev 3018)
+++
projects/wsintegration/jbws-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml 2007-05-09
17:09:16 UTC (rev 3019)
@@ -14,12 +14,12 @@
<servlet>
<servlet-name>ContextServlet</servlet-name>
-
<servlet-class>org.jboss.ws.integration.jboss50.JBossContextServlet</servlet-class>
+ <servlet-class>org.jboss.ws.core.server.ContextServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>PortComponentLinkServlet</servlet-name>
-
<servlet-class>org.jboss.ws.integration.jboss50.PortComponentLinkServlet</servlet-class>
+
<servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</servlet-class>
</servlet>
<!-- now the mappings -->