[jbossws-commits] JBossWS SVN: r3624 - in trunk/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 05:11:36 EDT 2007 

Author: heiko.braun at jboss.com
Date: 2007-06-19 05:11:35 -0400 (Tue, 19 Jun 2007)
New Revision: 3624

Removed:
   trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java
Modified:
   trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
   trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
   trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
   trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
   trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java
   trunk/integration/xfire/ant-import/build-bin-dist.xml
Log:
EndpointName deployer strips leading slash from context-root

Deleted: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java	2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointNameDeployer.java	2007-06-19 09:11:35 UTC (rev 3624)
@@ -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: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml	2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml	2007-06-19 09:11:35 UTC (rev 3624)
@@ -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: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml	2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml	2007-06-19 09:11:35 UTC (rev 3624)
@@ -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: trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml	2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml	2007-06-19 09:11:35 UTC (rev 3624)
@@ -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: trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml	2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml	2007-06-19 09:11:35 UTC (rev 3624)
@@ -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: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java	2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointNameDeployer.java	2007-06-19 09:11:35 UTC (rev 3624)
@@ -38,7 +38,12 @@
    {
       String contextRoot = dep.getService().getContextRoot();
 
-      for (Endpoint ep : dep.getService().getEndpoints())
+		if(contextRoot.startsWith("/"))
+			contextRoot = contextRoot.substring(1);
+		else
+			throw new IllegalArgumentException("Expected context-root with leading slash");
+
+		for (Endpoint ep : dep.getService().getEndpoints())
       {
          StringBuilder name = new StringBuilder(Endpoint.SEPID_DOMAIN + ":");
          name.append(Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextRoot + ",");

Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml	2007-06-19 08:49:13 UTC (rev 3623)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml	2007-06-19 09:11:35 UTC (rev 3624)
@@ -97,6 +97,7 @@
 		<copy todir="${bindist.lib.dir}" overwrite="true">
 			<fileset dir="${spi.dir}/output/lib">
 				<include name="jbossws-spi.jar"/>
+				<include name="jbossws-spi-scripts.zip"/>
 			</fileset>
 			<fileset dir="${spi.dir}/thirdparty">
 				<include name="getopt.jar"/>

More information about the jbossws-commits mailing list