[jbossws-commits] JBossWS SVN: r3643 - in branches/jbossws-2.0: integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Jun 19 17:54:30 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-19 17:54:29 -0400 (Tue, 19 Jun 2007)
New Revision: 3643
Removed:
branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java
Modified:
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java
Log:
Fix EndpointNameDeployer
Deleted: branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java 2007-06-19 16:31:10 UTC (rev 3642)
+++ branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java 2007-06-19 21:54:29 UTC (rev 3643)
@@ -1,54 +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.wsf.stack.jbws;
-
-//$Id$
-
-import javax.management.ObjectName;
-
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.wsf.spi.deployment.AbstractDeployer;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-/**
- * A deployer that assigns the complete name to the Endpoint
- *
- * @author Thomas.Diesler at jboss.org
- * @since 25-Apr-2007
- */
-public class EndpointNameDeployer extends AbstractDeployer
-{
- @Override
- public void create(Deployment dep)
- {
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class);
- if (sepMetaData == null)
- throw new IllegalStateException("Cannot obtain endpoint meta data");
-
- ObjectName sepID = sepMetaData.getServiceEndpointID();
- ep.setName(sepID);
- }
- }
-}
\ No newline at end of file
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-19 16:31:10 UTC (rev 3642)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-19 21:54:29 UTC (rev 3643)
@@ -134,7 +134,7 @@
</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
- <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-19 16:31:10 UTC (rev 3642)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-19 21:54:29 UTC (rev 3643)
@@ -135,7 +135,7 @@
</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
- <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-19 16:31:10 UTC (rev 3642)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-19 21:54:29 UTC (rev 3643)
@@ -139,7 +139,7 @@
</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
- <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer">
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-19 16:31:10 UTC (rev 3642)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-19 21:54:29 UTC (rev 3643)
@@ -150,7 +150,7 @@
</property>
</bean>
<bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/>
- <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/>
<bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/>
<bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/>
<bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeployer">
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java 2007-06-19 16:31:10 UTC (rev 3642)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java 2007-06-19 21:54:29 UTC (rev 3643)
@@ -37,11 +37,13 @@
public void create(Deployment dep)
{
String contextRoot = dep.getService().getContextRoot();
+ if (contextRoot.startsWith("/") == false)
+ throw new IllegalStateException("Context root expected to start with leading slash: " + contextRoot);
for (Endpoint ep : dep.getService().getEndpoints())
{
StringBuilder name = new StringBuilder(Endpoint.SEPID_DOMAIN + ":");
- name.append(Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextRoot + ",");
+ name.append(Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextRoot.substring(1) + ",");
name.append(Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ep.getShortName());
ep.setName(ObjectNameFactory.create(name.toString()));
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-06-19 16:31:10 UTC (rev 3642)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-06-19 21:54:29 UTC (rev 3643)
@@ -57,23 +57,23 @@
public void testConnectString() throws Exception
{
- doConnect(TARGET_ENDPOINT_ADDRESS);
+ runEndpointTest(TARGET_ENDPOINT_ADDRESS);
}
public void testConnectURL() throws Exception
{
- doConnect(new URL(TARGET_ENDPOINT_ADDRESS));
+ runEndpointTest(new URL(TARGET_ENDPOINT_ADDRESS));
}
- private void doConnect(Object endPoint) throws Exception
+ private void runEndpointTest(Object endPoint) throws Exception
{
- SOAPMessage request = buildMessage();
+ SOAPMessage request = buildValidMessage();
SOAPConnection connection = SOAPConnectionFactory.newInstance().createConnection();
SOAPMessage response = connection.call(request, endPoint);
validateResponse(response);
}
- private SOAPMessage buildMessage() throws Exception
+ private SOAPMessage buildValidMessage() throws Exception
{
SOAPMessage message = MessageFactory.newInstance().createMessage();
SOAPPart sp = message.getSOAPPart();
More information about the jbossws-commits
mailing list