[jbossws-commits] JBossWS SVN: r6342 - in container/jboss50/branches: jbossws-jboss501 and 26 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Apr 10 14:29:28 EDT 2008


Author: heiko.braun at jboss.com
Date: 2008-04-10 14:29:28 -0400 (Thu, 10 Apr 2008)
New Revision: 6342

Added:
   container/jboss50/branches/jbossws-jboss501/
   container/jboss50/branches/jbossws-jboss501/THIS-IS-3.0
   container/jboss50/branches/jbossws-jboss501/ant-import/
   container/jboss50/branches/jbossws-jboss501/ant-import/build-release.xml
   container/jboss50/branches/jbossws-jboss501/ant-import/build-setup.xml
   container/jboss50/branches/jbossws-jboss501/ant-import/build-thirdparty.xml
   container/jboss50/branches/jbossws-jboss501/ant.properties
   container/jboss50/branches/jbossws-jboss501/ant.properties.example
   container/jboss50/branches/jbossws-jboss501/build-as.xml
   container/jboss50/branches/jbossws-jboss501/build.xml
   container/jboss50/branches/jbossws-jboss501/src/
   container/jboss50/branches/jbossws-jboss501/src/assembly/
   container/jboss50/branches/jbossws-jboss501/src/assembly/jbossws-jboss50-deployer.xml
   container/jboss50/branches/jbossws-jboss501/src/main/
   container/jboss50/branches/jbossws-jboss501/src/main/etc/
   container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml
   container/jboss50/branches/jbossws-jboss501/src/main/etc/default.mf
   container/jboss50/branches/jbossws-jboss501/src/main/java/
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/
   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/deployer/
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java
   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/ArchiveDeployerHook.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java
   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/JAXRPCDeployerHookPostJSE.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.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/JAXWSDeployerHookPostJSE.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.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/deployer/WebServiceDeployerPostJSE.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/
   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/
   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/ContainerMetaDataDeploymentAspect.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.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/metadata/JSEArchiveMetaDataAdapter.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandler.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.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/deployment/tomcat/WebMetaDataModifier.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/
   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
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java
   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/InvocationHandlerFactoryImpl.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java
   container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java
   container/jboss50/branches/jbossws-jboss501/src/main/resources/
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/META-INF/
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.deployer/
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
   container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
   container/jboss50/branches/jbossws-jboss501/version.properties
   container/jboss50/branches/jbossws-jboss501/version.properties.md5
Log:
AS 5 CR1 container integration, first cut

Added: container/jboss50/branches/jbossws-jboss501/THIS-IS-3.0
===================================================================

Added: container/jboss50/branches/jbossws-jboss501/ant-import/build-release.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/ant-import/build-release.xml	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/ant-import/build-release.xml	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+  <!-- Release to jboss.local.repository -->
+  <target name="release" depends="jars" 
+    description="Release to jboss.local.repository">
+
+    <!-- jboss/jbossws-jboss50 -->
+    <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
+    <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/>
+    <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true">
+      <fileset dir="${jbws50.dir}/output/lib">
+        <include name="jbossws-jboss50.jar"/>
+        <include name="jbossws-jboss50-src.zip"/>
+        <include name="jbossws-jboss50-resources.zip"/>
+      </fileset>
+    </copy>
+    <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jbws50.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+      <filterset>
+        <filtersfile file="${jbws50.dir}/version.properties"/>
+      </filterset>
+    </copy>
+    
+  </target>
+
+</project>


Property changes on: container/jboss50/branches/jbossws-jboss501/ant-import/build-release.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/ant-import/build-setup.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/ant-import/build-setup.xml	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/ant-import/build-setup.xml	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+  
+  <!-- ================================================================== -->
+  <!-- Setup                                                              -->
+  <!-- ================================================================== -->
+	
+  <property name="jbws50.dir" value="${basedir}"/>
+  
+  <!-- Check if ant.properties is available -->
+  <available property="ant.properties.available" file="${jbws50.dir}/ant.properties"/>
+  <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+  
+  <property file="${jbws50.dir}/ant.properties"/>
+  <property file="${jbws50.dir}/version.properties"/>
+  
+  <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+  <property name="jboss50.client" value="${jboss50.home}/client"/>
+  <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+  <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+  <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+  <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+
+  <property name="jboss50.available.file" value="${jboss50.client}/jboss-client.jar"/>
+  <available property="jboss50.available" file="${jboss50.available.file}"/>
+  
+  <!-- JDK Detection -->
+  <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
+  <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+  
+  <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
+  
+  <!-- ================================================================== -->
+  <!-- Initialization                                                     -->
+  <!-- ================================================================== -->
+  
+  <target name="prepare">
+    <tstamp>
+      <format property="build.id" pattern="yyyyMMddHHmm"/>
+    </tstamp>
+  </target>
+  
+</project>
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/ant-import/build-setup.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/ant-import/build-thirdparty.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/ant-import/build-thirdparty.xml	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/ant-import/build-thirdparty.xml	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+   <!-- ========= -->
+   <!-- Libraries -->
+   <!-- ========= -->
+
+   <target name="thirdparty-init" depends="prepare">
+
+      <property name="thirdparty.dir" value="${jbws50.dir}/thirdparty"/>
+      <checksum file="${jbws50.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
+      <condition property="force.thirdparty">
+         <or>
+            <not>
+               <available file="${thirdparty.dir}" type="dir"/>
+            </not>
+            <isfalse value="${checksum.ok}"/>
+            <isset property="force.thirdparty.get"/>
+         </or>
+      </condition>
+      <echo message="checksum.ok = ${checksum.ok}"/>
+   </target>
+
+   <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries">
+
+      <mkdir dir="${thirdparty.dir}"/>
+      <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
+      <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common-src.zip" dest="${thirdparty.dir}/jbossws-common-src.zip" usetimestamp="true" verbose="true"/>
+      <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
+      <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
+      <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/>
+      <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
+      <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
+
+      <get src="${jboss.repository}/jboss/jbossws/${jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jboss-jaxws.jar" usetimestamp="true" verbose="true"/>
+      <get src="${jboss.repository}/jboss/jbossws/${jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/>
+      <get src="${jboss.repository}/jboss/jbossws/${jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jboss-saaj.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"/>
+
+      <checksum file="${jbws50.dir}/version.properties" fileext=".md5"/>
+   </target>
+
+   <target name="thirdparty-classpath" depends="thirdparty-get">
+
+      <!-- The compile classpath for jboss50 integration -->
+      <path id="jbws50.integration.classpath">
+         <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar -->
+         <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
+         <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
+         <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/>
+         <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/>
+         <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/>
+         <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+
+         <pathelement location="${jboss50.lib}/jboss-common-core.jar" />
+         <pathelement location="${jboss50.lib}/jboss-classloading-spi.jar" />
+         <pathelement location="${jboss50.lib}/jboss-deployers-client-spi.jar" />
+         <pathelement location="${jboss50.lib}/jboss-deployers-client.jar" /><!-- why this?  -->
+         <pathelement location="${jboss50.lib}/jboss-deployers-core-spi.jar" />
+         <pathelement location="${jboss50.lib}/jboss-deployers-spi.jar" />
+         <pathelement location="${jboss50.lib}/jboss-deployers-structure-spi.jar" />
+         <pathelement location="${jboss50.lib}/jboss-deployers-vfs-spi.jar" />
+         <pathelement location="${jboss50.lib}/jboss-dependency.jar" />
+         <pathelement location="${jboss50.lib}/jboss-j2se.jar" />
+         <pathelement location="${jboss50.lib}/jaxb-api.jar" />
+         <pathelement location="${jboss50.lib}/jboss-mdr.jar" />
+         <pathelement location="${jboss50.lib}/jboss-reflect.jar" />
+         <pathelement location="${jboss50.lib}/jboss-logging-spi.jar" />
+         <pathelement location="${jboss50.lib}/jboss-kernel.jar" />
+         <pathelement location="${jboss50.lib}/jboss-system.jar" />
+         <pathelement location="${jboss50.lib}/jboss-system-jmx.jar" />
+         <pathelement location="${jboss50.lib}/jboss-xml-binding.jar" />
+         <pathelement location="${jboss50.lib}/jboss-vfs.jar" /><!-- why this? -->
+
+         <pathelement location="${jboss50.server.lib}/jboss.jar" />
+         <pathelement location="${jboss50.server.lib}/jboss-metadata.jar" />
+         <pathelement location="${jboss50.server.lib}/jboss-javaee.jar" />
+
+         <pathelement location="${jboss50.server.lib}/jboss-ejb3-core.jar" />
+         <pathelement location="${jboss50.server.lib}/jboss-ejb3-interceptors.jar" />
+         <pathelement location="${jboss50.server.lib}/jboss-ejb3-ext-api.jar" />
+
+         <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar" />
+         <pathelement location="${jboss50.server.lib}/jbosssx.jar" /><!-- Why this ? -->
+
+         <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar" />         
+
+
+      </path>
+
+   </target>
+
+</project>
+


Property changes on: container/jboss50/branches/jbossws-jboss501/ant-import/build-thirdparty.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/ant.properties
===================================================================
--- container/jboss50/branches/jbossws-jboss501/ant.properties	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/ant.properties	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,26 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler at jboss.com $
+
+# JBoss Home
+jboss50.home=/home/hbraun/dev/prj/jbossas/trunk/build/output/jboss-5.0.0.CR1
+
+# The JBoss settings
+jboss.server.instance=default
+
+# JBoss Repository
+jboss.repository=file:/home/hbraun/dev/prj/jboss.local.repository
+#jboss.repository=http://repository.jboss.org
+
+# JBossWS Release
+jboss.local.repository=/home/hbraun/dev/prj/jboss.local.repository
+
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no

Added: container/jboss50/branches/jbossws-jboss501/ant.properties.example
===================================================================
--- container/jboss50/branches/jbossws-jboss501/ant.properties.example	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/ant.properties.example	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,26 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler at jboss.com $
+
+# JBoss Home
+jboss50.home=/home/hbraun/dev/prj/jbossas/trunk/build/output/jboss-5.0.0.CR1
+
+# The JBoss settings
+jboss.server.instance=default
+
+# JBoss Repository
+jboss.repository=file:/home/hbraun/dev/prj/jboss.local.repository
+#jboss.repository=http://repository.jboss.org
+
+# JBossWS Release
+jboss.local.repository=/home/hbraun/dev/prj/jboss.local.repository
+
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no

Added: container/jboss50/branches/jbossws-jboss501/build-as.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/build-as.xml	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/build-as.xml	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" name="JBoss/Webservices">
+
+  <!-- ================================================================== -->
+  <!-- Setup                                                              -->
+  <!-- ================================================================== -->
+
+  <!-- ================================================================== -->
+  <!-- Configuration                                                      -->
+  <!-- ================================================================== -->
+
+  <!--
+     | Configure the build system.
+     |
+     | This target is invoked by the Buildmagic initialization logic and
+     | should contain module specific configuration elements.
+   -->
+
+  <target name="configure" unless="configure.disable">
+
+    <!-- =================== -->
+    <!-- Basic Configuration -->
+    <!-- =================== -->
+
+    <!-- Module name(s) & version -->
+    <property name="module.name" value="webservices"/>
+    <property name="module.Name" value="JBossWS Container Integration"/>
+    <property name="module.version" value="DEV"/>
+
+    <!-- ========= -->
+    <!-- Libraries -->
+    <!-- ========= -->
+
+    <!-- The combined library classpath -->
+    <!--path id="library.classpath">
+      <path refid="apache.xerces.classpath"/>
+      <path refid="dom4j.dom4j.classpath"/>
+      <path refid="jboss.aop.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.jboss.ejb3.core.classpath" />   
+      <path refid="jboss.jboss.ejb3.ext.api.classpath" />   
+      <path refid="jboss.jboss.ejb3.interceptors.classpath" />   
+      <path refid="jboss.jboss.javaee.classpath"/>
+      <path refid="jboss.jboss.security.spi.classpath"/>
+      <path refid="jboss.jboss.vfs.classpath"/>
+      <path refid="jboss.jbosssx.classpath"/>
+      <path refid="jboss.jbossws.classpath"/>
+      <path refid="jboss.jbossws.common.classpath"/>
+      <path refid="jboss.jbossws.framework.classpath"/>
+      <path refid="jboss.jbossws.spi.classpath"/>
+      <path refid="jboss.jbossxb.classpath"/>
+      <path refid="jboss.metadata.classpath"/>
+      <path refid="jboss.jboss.deployers.classpath"/>      
+      <path refid="jboss.microcontainer.classpath"/>
+      <path refid="sun.jaxb.classpath"/>
+      <path refid="sun.servlet.classpath"/>
+    </path-->
+
+
+    <!-- The combined dependant module classpath -->
+    <!--path id="dependentmodule.classpath">
+      <path refid="jboss.aspects.classpath"/>
+      <path refid="jboss.j2se.classpath"/>
+      <path refid="jboss.jmx.classpath"/>
+      <path refid="jboss.server.classpath"/>
+      <path refid="jboss.system.classpath"/>
+      <path refid="jboss.systemjmx.classpath"/>
+      <path refid="jboss.tomcat.classpath"/>
+    </path-->
+
+    <!-- ===== -->
+    <!-- Tasks -->
+    <!-- ===== -->
+
+    <property name="jar.prefix" value="jbossws-jboss50"/>
+    <property name="javac.target" value="1.5"/>
+    <property name="javac.source" value="1.5"/>
+
+    <call target="_default:task-init"/>
+
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Compile                                                            -->
+  <!-- ================================================================== -->
+
+  <!--
+     | Compile everything.
+     |
+     | This target should depend on other compile-* targets for each
+     | different type of compile that needs to be performed, short of
+     | documentation compiles.
+   -->
+
+  <target name="compile"
+	  description="Compile all source files."
+	  depends="_default:compile-classes,
+              _default:compile-resources,
+              _default:compile-etc"/>
+
+  <!-- ================================================================== -->
+  <!-- Archives                                                           -->
+  <!-- ================================================================== -->
+
+  <!-- 
+     |  Build all jar files.
+  -->
+  <target name="module-jars" depends="compile">
+
+    <!-- Concat jbossws-beans.xml -->
+    <concat destfile="${build.resources}/jbossws-beans.xml">
+      <header trimleading="yes">
+        &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt;
+      </header>
+      <fileset file="${jboss.jbossws.resources}/jbossws-native-config.xml"/>
+      <footer trimleading="yes">
+        &lt;/deployment&gt;
+      </footer>
+    </concat>
+    
+    <!-- Build jbossws-jboss50.jar -->
+    <jar jarfile="${build.lib}/jbossws-jboss50.jar" manifest="${build.etc}/default.mf">
+      <fileset dir="${build.classes}" />
+      <metainf dir="${build.resources}/jbossws-jboss50.jar/META-INF"/>
+    </jar>
+
+    <!-- Build jbossws-native50.deployer -->
+    <zip zipfile="${build.lib}/jbossws-jboss50-deployer.zip">
+      <fileset dir="${build.lib}">
+        <include name="jbossws-jboss50.jar"/>
+      </fileset>
+      <fileset dir="${jboss.jbossws.common.lib}">
+        <include name="jbossws-common.jar"/>
+      </fileset>
+      <fileset dir="${jboss.jbossws.framework.lib}">
+        <include name="jbossws-framework.jar"/>
+      </fileset>
+      <fileset dir="${build.resources}/jbossws-jboss50.deployer">
+        <include name="META-INF/jbossws-deployer-beans.xml"/>
+      </fileset>
+    </zip>
+    
+    <!-- Build jbossws.sar -->
+    <jar jarfile="${build.lib}/jbossws.sar">
+      <fileset dir="${jboss.jbossws.lib}">
+        <include name="jbossws-core.jar"/>
+      </fileset>
+      <fileset dir="${wscommons.policy.lib}">
+        <include name="policy.jar"/>
+      </fileset>
+      <fileset dir="${ibm.wsdl4j.lib}">
+        <include name="wsdl4j.jar"/>
+      </fileset>
+      <fileset dir="${apache.xmlsec.lib}">
+        <include name="xmlsec.jar"/>
+      </fileset>
+      <fileset dir="${jboss.jaxbintros.lib}">
+        <include name="jboss-jaxb-intros.jar"/>
+      </fileset>
+      <metainf dir="${jboss.jbossws.resources}">
+        <include name="standard-*-config.xml"/>
+      </metainf>
+      <metainf dir="${build.resources}">
+        <include name="jbossws-beans.xml"/>
+      </metainf>
+    </jar>
+
+     <!-- jbossws-jboss50-container.jar -->
+     <jar jarfile="${build.lib}/jbossws-jboss50-container.jar">
+        <metainf dir="${build.resources}/jbossws-jboss50-container.jar/META-INF">
+           <include name="jbossws-container-beans.xml"/>
+        </metainf>
+     </jar>
+
+
+  </target>
+
+  <!-- ================================================================== -->
+  <!-- Deployment                                                         -->
+  <!-- ================================================================== -->
+
+  <!-- 
+     |  Build all jar files.
+  -->
+  <target name="deploy" depends="main,module-jars">
+
+
+    <!-- Build jbossws-native50.deployer -->
+    <unzip dest="../build/output/jboss-${specification.version}/server/default/deployers/jbossws.deployer"
+           src="${build.lib}/jbossws-jboss50-deployer.zip">
+    </unzip>
+
+     <copy todir="../build/output/jboss-${specification.version}/server/default/deploy">
+        <fileset dir="${build.lib}">
+           <include name="jbossws-jboss50-container.jar"/>
+        </fileset>
+     </copy>
+  </target>
+</project>


Property changes on: container/jboss50/branches/jbossws-jboss501/build-as.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/build.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/build.xml	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/build.xml	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS-JBoss50">
+  
+  <import file="${basedir}/ant-import/build-setup.xml"/>
+  <import file="${basedir}/ant-import/build-release.xml"/>
+  <import file="${basedir}/ant-import/build-thirdparty.xml"/>
+  
+  <!-- ================================================================== -->
+  <!-- Setup                                                              -->
+  <!-- ================================================================== -->
+  
+  <property name="jbws50.dir" value="${int.jboss50.dir}"/>
+  <property name="jbws50.src.dir" value="${jbws50.dir}/src/main"/>
+  <property name="jbws50.etc.dir" value="${jbws50.src.dir}/etc"/>
+  <property name="jbws50.java.dir" value="${jbws50.src.dir}/java"/>
+  <property name="jbws50.resources.dir" value="${jbws50.src.dir}/resources"/>
+  <property name="jbws50.output.dir" value="${jbws50.dir}/output"/>
+  <property name="jbws50.output.apidocs.dir" value="${jbws50.output.dir}/apidocs"/>
+  <property name="jbws50.output.classes.dir" value="${jbws50.output.dir}/classes"/>
+  <property name="jbws50.output.etc.dir" value="${jbws50.output.dir}/etc"/>
+  <property name="jbws50.output.lib.dir" value="${jbws50.output.dir}/lib"/>
+
+  <!-- ================================================================== -->
+  <!-- Initialization                                                     -->
+  <!-- ================================================================== -->
+  
+  <target name="init" depends="prepare,thirdparty-get">
+    <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+  </target>
+  
+  <!-- ================================================================== -->
+  <!-- Compile                                                            -->
+  <!-- ================================================================== -->
+  
+  <!--
+  | Compile everything.
+  |
+  | This target should depend on other compile-* targets for each
+  | different type of compile that needs to be performed, short of
+  | documentation compiles.
+  -->
+  
+  <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>
+  
+  <!-- Compile integration java sources -->
+  <target name="compile-classes" depends="init">
+    <mkdir dir="${jbws50.output.classes.dir}"/>
+    <javac srcdir="${jbws50.java.dir}" sourcepath="" destdir="${jbws50.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+      deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+      <include name="org/jboss/ws/integration/**"/>
+      <include name="org/jboss/wsf/container/jboss50/**"/>
+      <exclude name="org/jboss/wsf/container/jboss50/jms/**"/>
+      <classpath refid="jbws50.integration.classpath"/>
+    </javac>
+  </target>
+  
+  <!-- Compile etc files (manifests and such) -->
+  <target name="compile-etc" depends="init">
+    <mkdir dir="${jbws50.output.etc.dir}"/>
+    <copy todir="${jbws50.output.etc.dir}" filtering="yes" overwrite="true">
+      <fileset dir="${jbws50.etc.dir}">
+        <include name="default.mf"/>
+  	  </fileset>
+      <filterset>
+        <filter token="java.vm.version" value="${java.vm.version}"/>
+        <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
+        <filter token="build.id" value="${build.id}"/>
+        <filter token="implementation.version" value="jbossws-${version.id}"/>
+        <filtersfile file="${jbws50.dir}/version.properties"/>
+      </filterset>
+    </copy>
+  </target>
+  
+  <!-- ================================================================== -->
+  <!-- Archives                                                           -->
+  <!-- ================================================================== -->
+  
+  <!--
+  | Build all jar files.
+  -->
+  <target name="jars"  depends="compile,module-jars" description="Builds all jar files.">
+  </target>
+  
+  <!--
+  |  Build all jar files.
+  -->
+  <target name="module-jars" depends="init">
+    
+    <!-- Build jbossws-jboss50.jar -->
+    <mkdir dir="${jbws50.output.lib.dir}"/>
+    <jar jarfile="${jbws50.output.lib.dir}/jbossws-jboss50.jar" manifest="${jbws50.output.etc.dir}/default.mf">
+      <fileset dir="${jbws50.output.classes.dir}">
+        <include name="org/jboss/ws/integration/**"/>
+        <include name="org/jboss/wsf/container/jboss50/**"/>
+      </fileset>
+      <metainf dir="${jbws50.resources.dir}/jbossws-jboss50.jar/META-INF"/>
+    </jar>
+    
+    <!-- Build jbossws-jboss50-resources.zip -->
+    <zip zipfile="${jbws50.output.lib.dir}/jbossws-jboss50-resources.zip" >
+      <fileset dir="${jbws50.resources.dir}"/>
+    </zip>
+    
+    <!-- Build jbossws-jboss50-src.zip -->
+    <zip zipfile="${jbws50.output.lib.dir}/jbossws-jboss50-src.zip" >
+      <fileset dir="${jbws50.java.dir}"/>
+    </zip>
+    
+  </target>
+
+	<!-- Generate the JavaDoc -->
+   <target name="javadoc" depends="init" description="Generate the Javadoc">
+
+		<mkdir dir="${jbws50.output.apidocs.dir}"/>
+      <javadoc destdir="${jbws50.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+         <classpath>
+				<path refid="jbws50.integration.classpath"/>
+			</classpath>
+         <packageset dir="${jbws50.java.dir}" defaultexcludes="yes">
+            <include name="org/jboss/wsf/**"/>
+         </packageset>
+         <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 4.0</h1>]]></doctitle>
+         <tag name="todo" scope="all" description="To do:"/>
+		</javadoc>
+   </target>
+
+  <!-- ================================================================== -->
+  <!-- Miscellaneous                                                       -->
+  <!-- ================================================================== -->
+  
+  <target name="clean" depends="prepare" description="Cleans up most generated files.">
+    <delete dir="${jbws50.output.dir}"/>
+  </target>
+  
+  <target name="clobber" depends="clean" description="Cleans up all generated files.">
+    <delete dir="${jbws50.dir}/thirdparty"/>
+  </target>
+  
+  <target name="main" description="Executes the default target (most)." depends="most"/>
+  
+  <target name="most" description="Builds almost everything." depends="jars"/>
+  
+  <target name="all" description="Create a distribution zip file" depends="main">
+  </target>
+  
+</project>


Property changes on: container/jboss50/branches/jbossws-jboss501/build.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/assembly/jbossws-jboss50-deployer.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/assembly/jbossws-jboss50-deployer.xml	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/assembly/jbossws-jboss50-deployer.xml	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,32 @@
+<assembly>
+  <id>jbossws-jboss50</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>src/resources</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>META-INF/jbossws-deployer-beans.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>jboss-as-webservices-${project.version}.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <unpack>false</unpack>
+      <includes>
+        <include>jboss:jbossws-framework</include>
+        <include>jboss:jbossws-common</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/src/assembly/jbossws-jboss50-deployer.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,28 @@
+<project name="jboss/jbossws-jboss50">
+  
+  <component id="jboss/jbossws-jboss50"
+    description="JBossWS container integration layer" 
+    version="@repository.id@"
+    licenseType="lgpl">
+    
+    <artifact id="jbossws-jboss50.jar"/>
+    <artifact id="jbossws-jboss50-deployer.zip"/>
+    <artifact id="jbossws-jboss50-src.zip"/>
+    
+    <import componentref="jboss/jbossws-common">
+      <compatible version="@jbossws-common@"/>
+    </import>
+    <import componentref="jboss/jbossws-framework">
+      <compatible version="@jbossws-framework@"/>
+    </import>
+    <import componentref="jboss/jbossws-spi">
+      <compatible version="@jbossws-spi@"/>
+    </import>
+    
+    <export>
+      <include input="jbossws-jboss50.jar"/>
+    </export>
+    
+  </component>
+  
+</project>


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/etc/component-info.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/etc/default.mf
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/etc/default.mf	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/etc/default.mf	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.2
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@ (build=@build.id@)
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,154 @@
+/*
+ * 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;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.ComposableRuntime;
+import org.jboss.wsf.spi.WSFRuntime;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
+import org.jboss.wsf.spi.invocation.InvocationHandlerFactory;
+import org.jboss.wsf.spi.invocation.RequestHandlerFactory;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.transport.TransportManagerFactory;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class BareWSFRuntime implements WSFRuntime, ComposableRuntime
+{
+   private static final Logger log = Logger.getLogger(BareWSFRuntime.class);
+ 
+   private String runtimeName;
+
+   private DeploymentAspectManager deploymentManager;
+
+   private EndpointRegistry endpointRegistry;
+
+   private RequestHandlerFactory requestHandlerFactory;
+
+   private InvocationHandlerFactory invocationHandlerFactory;
+
+   private TransportManagerFactory transportManagerFactory;
+
+   public String getRuntimeName()
+   {
+      return runtimeName;
+   }
+
+   public void setRuntimeName(String runtimeName)
+   {
+      this.runtimeName = runtimeName;
+   }
+  
+   // ---------------------------------------------------------------------------------
+
+
+   public void create(Deployment deployment)
+   {
+      deploymentManager.create(deployment, this);
+   }
+
+   public void start(Deployment deployment)
+   {
+      deploymentManager.start(deployment, this);
+   }
+
+   public void stop(Deployment deployment)
+   {
+      deploymentManager.stop(deployment, this);
+   }
+
+   public void destroy(Deployment deployment)
+   {
+      deploymentManager.destroy(deployment, this);
+   }
+
+   // ---------------------------------------------------------------------------------
+
+
+   public void setTransportManagerFactory(TransportManagerFactory factory)
+   {
+      assert factory!=null;
+      log.info(runtimeName + " -> TransportManagerFactory: " + factory);
+      this.transportManagerFactory = factory;
+   }
+
+   public TransportManagerFactory getTransportManagerFactory()
+   {
+      return this.transportManagerFactory;
+   }
+
+   public void setEndpointRegistry(EndpointRegistry endpointRegistry)
+   {
+      assert endpointRegistry!=null;
+      log.info(runtimeName + " -> EndpointRegistry: " + endpointRegistry);
+      this.endpointRegistry = endpointRegistry;
+   }
+
+   public EndpointRegistry getEndpointRegistry()
+   {
+      return this.endpointRegistry;
+   }
+
+   public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager)
+   {
+      assert deploymentManager!=null;
+      log.info(runtimeName + " -> DeploymentAspectManager: " + deploymentManager);
+      this.deploymentManager = deploymentManager;
+   }
+
+   public DeploymentAspectManager getDeploymentAspectManager()
+   {
+      return this.deploymentManager;
+   }
+
+   public void setRequestHandlerFactory(RequestHandlerFactory factory)
+   {
+      assert factory!=null;
+      log.info(runtimeName + " -> RequestHandlerFactory: "+ factory);
+      this.requestHandlerFactory = factory;
+   }
+
+
+   public RequestHandlerFactory getRequestHandlerFactory()
+   {
+      return this.requestHandlerFactory;
+   }
+
+   public void setInvocationHandlerFactory(InvocationHandlerFactory factory)
+   {
+      assert factory!=null;
+      log.info(runtimeName + " -> InvocationHandlerFactory: "+ factory);
+      this.invocationHandlerFactory = factory;
+   }
+
+   public InvocationHandlerFactory getInvocationHandlerFactory()
+   {
+      return this.invocationHandlerFactory;
+   }
+
+   public String toString()
+   {
+      return this.runtimeName+ " :" + super.toString();
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,129 @@
+/*
+ * 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.container.jboss50.deployer;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.WSFRuntime;
+import org.jboss.wsf.spi.WSFRuntimeLocator;
+import org.jboss.wsf.spi.deployment.*;
+import org.jboss.wsf.container.jboss50.deployer.DeployerHook;
+
+//$Id$
+
+
+/**
+ * An abstract web service deployer.
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @author Heiko.Braun at jboss.com
+ * 
+ * @since 25-Apr-2007
+ */
+public abstract class AbstractDeployerHook implements DeployerHook
+{
+   // provide logging
+   protected final Logger log = Logger.getLogger(getClass());
+
+   protected String runtimeName;
+   private WSFRuntime wsfRuntime;
+
+   private DeploymentModelFactory deploymentModelFactory;
+
+   public WSFRuntime getWsfRuntime()
+   {
+      if(null == wsfRuntime)
+      {
+         SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+         wsfRuntime = spiProvider.getSPI(WSFRuntimeLocator.class).locateRuntime(runtimeName);
+      }
+      
+      return wsfRuntime;
+   }
+
+   public void setWsfRuntime(WSFRuntime wsfRuntime)
+   {
+      this.wsfRuntime = wsfRuntime;
+   }
+
+   public void setRuntimeName(String runtimeName)
+   {
+      this.runtimeName = runtimeName;
+   }
+
+   public DeploymentModelFactory getDeploymentModelFactory()
+   {
+      if(null == deploymentModelFactory)
+      {
+         SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+         deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
+      }
+
+      return deploymentModelFactory;
+   }
+
+   public ArchiveDeployment newDeployment(DeploymentUnit unit)
+   {
+      try
+      {
+         DeploymentModelFactory factory = getDeploymentModelFactory();
+         ArchiveDeployment dep = (ArchiveDeployment)factory.newDeployment(unit.getSimpleName(), unit.getClassLoader());
+         if (unit.getParent() != null)
+         {
+            DeploymentUnit parentUnit = unit.getParent();
+            ArchiveDeployment parentDep = (ArchiveDeployment)factory.newDeployment(parentUnit.getSimpleName(), parentUnit.getClassLoader());
+            dep.setParent(parentDep);
+         }
+         return dep;
+      }
+      catch (Exception ex)
+      {
+         throw new WSFDeploymentException("Cannot load spi.deployment.Deployment class", ex);
+      }
+   }
+
+   public Endpoint newEndpoint(String targetBean)
+   {
+      try
+      {
+         return getDeploymentModelFactory().newEndpoint(targetBean);
+      }
+      catch (Exception ex)
+      {
+         throw new WSFDeploymentException("Cannot load spi.deployment.Endpoint class", ex);
+      }
+   }
+
+   /** Return true if this deployment should be ignored
+    */
+   public boolean ignoreDeployment(DeploymentUnit unit)
+   {
+      String name = unit.getName();
+      return (name.startsWith("jboss:id=") && name.indexOf("service=jacc") > 0);
+   }
+
+   /** Get the deployment type this deployer can handle
+    */
+   public abstract Deployment.DeploymentType getDeploymentType();
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,56 @@
+/*
+ * 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.container.jboss50.deployer;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.wsf.spi.deployment.Deployment;
+import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState;
+
+//$Id$
+
+/**
+ * An abstract deployer for EJB Endpoints
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook
+{
+
+   public void deploy(DeploymentUnit unit) throws DeploymentException
+   {
+      if(!ignoreDeployment(unit) && isWebServiceDeployment(unit))
+      {
+         super.deploy(unit); // Calls create 
+
+         Deployment dep = unit.getAttachment(Deployment.class);
+         if(null==dep || DeploymentState.CREATED != dep.getState())
+            throw new DeploymentException("Create step failed");
+
+         // execute the 'start' step
+         getWsfRuntime().start(dep); 
+
+      }
+
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,68 @@
+/*
+ * 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.container.jboss50.deployer;
+
+//$Id$
+
+import java.util.List;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.transport.HttpSpec;
+import org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifier;
+
+/**
+ * An abstract deployer for JSE Endpoints
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook
+{
+   public boolean isWebServiceDeployment(DeploymentUnit unit)
+   {
+      JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
+      boolean isGenerated = Boolean.TRUE.equals(unit.getAttachment(HttpSpec.PROPERTY_GENERATED_WEBAPP));
+      return webMetaData != null && isGenerated == false;
+   }
+
+   protected String getTargetBean(ServletMetaData servlet)
+   {
+      String endpointClass = servlet.getServletClass();
+      List<ParamValueMetaData> initParams = servlet.getInitParam();
+      if (initParams != null)
+      {
+         for (ParamValueMetaData param : initParams)
+         {
+            if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(param.getParamName()))
+            {
+               endpointClass = param.getParamValue();
+               break;
+            }
+         }
+      }
+      return endpointClass;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,73 @@
+/*
+ * 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.container.jboss50.deployer;
+
+// $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;
+
+/**
+ * This deployer that calls the registered DeployerHooks
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @since 24-Apr-2007
+ */
+public abstract class AbstractWebServiceDeployer<T> extends AbstractComponentDeployer
+{
+   // provide logging
+   private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class);
+
+   private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>();
+
+   public void addDeployerHook(DeployerHook deployer)
+   {
+      log.debug("Add deployer hook: " + deployer);
+      deployerHooks.add(deployer);
+   }
+
+   public void removeDeployerHook(DeployerHook deployer)
+   {
+      log.debug("Remove deployer hook: " + deployer);
+      deployerHooks.remove(deployer);
+   }
+
+   @Override
+   public void internalDeploy(DeploymentUnit unit) throws DeploymentException
+   {
+      for (DeployerHook deployer : deployerHooks)
+         deployer.deploy(unit);
+   }
+
+   @Override
+   public void internalUndeploy(DeploymentUnit unit)
+   {
+      for (DeployerHook deployer : deployerHooks)
+         deployer.undeploy(unit);
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,169 @@
+/*
+ * 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.container.jboss50.deployer;
+
+//$Id$
+
+import java.net.URL;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.serviceref.VirtualFileAdaptor;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.w3c.dom.Element;
+
+/**
+ * An abstract web service deployer.
+ * <pre>
+ *    deploy(unit)
+ *      if(isWebServiceDeployment)
+ *        dep = createDeployment(unit)
+ *        create(dep)
+ *        start(dep)
+ *
+ *    undeploy(unit)
+ *      dep = getDeployment(unit) 
+ *      stop(dep)
+ *      destroy(dep)
+ * </pre>
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @author Heiko.Braun at jboss.com
+ * 
+ * @since 25-Apr-2007
+ */
+public abstract class ArchiveDeployerHook extends AbstractDeployerHook
+{
+   /**
+    * Executes the 'create' step only. <br/>
+    * Subclasses need to take care that the 'start' step is executed as well.          
+    */
+   public void deploy(DeploymentUnit unit) throws DeploymentException
+   {
+      if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
+      {
+         log.debug("deploy: " + unit.getName());
+
+         Deployment dep = getDeployment(unit);
+         if (dep == null)
+         {
+            dep = createDeployment(unit);
+            dep.addAttachment(DeploymentUnit.class, unit);
+         }
+
+         if(Deployment.DeploymentState.UNDEFINED == dep.getState())
+         {
+            getWsfRuntime().create(dep); 
+            unit.addAttachment(Deployment.class, dep);
+         }
+         else
+         {
+            throw new IllegalArgumentException("Cannot process Deployment in state " + dep.getState() + ": " + dep);
+         }
+      }
+   }
+
+   /**
+    * Executes the stop() and destroy() lifecycles
+    * @param unit
+    */
+   public void undeploy(DeploymentUnit unit)
+   {
+      if (ignoreDeployment(unit))
+         return;
+
+      Deployment dep = getDeployment(unit);
+      if (dep != null)
+      {
+         log.debug("undeploy: " + unit.getName());
+         getWsfRuntime().stop(dep);
+         getWsfRuntime().destroy(dep);
+      }
+   }
+
+   /** Depending on the type of deployment, this method should return true
+    *  if the deployment contains web service endpoints.
+    */
+   public abstract boolean isWebServiceDeployment(DeploymentUnit unit);
+
+   /** Create the Deployment for a given DeploymentUnit
+    */
+   public abstract Deployment createDeployment(DeploymentUnit unit);
+
+   /** Get the Deployment for a given DeploymentUnit
+    */
+   public Deployment getDeployment(DeploymentUnit unit)
+   {
+      Deployment dep = unit.getAttachment(Deployment.class);
+      return (dep != null && dep.getType() == getDeploymentType() ? dep : null);
+   }
+
+   /** Unmrashall the webservices.xml if there is one
+    */
+   protected WebservicesMetaData getWebservicesMetaData(DeploymentUnit unit)
+   {
+      WebservicesMetaData wsMetaData = unit.getAttachment(WebservicesMetaData.class);
+      UnifiedVirtualFile vfWebservices = getWebservicesFile(unit);
+      if (wsMetaData == null && vfWebservices != null)
+      {
+         try
+         {
+            URL wsURL = vfWebservices.toURL();
+            Element root = DOMUtils.parse(wsURL.openStream());
+            String namespaceURI = root.getNamespaceURI();
+            if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee"))
+            {
+               Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+               ObjectModelFactory factory = new WebservicesFactory(wsURL);
+               wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null);
+               unit.addAttachment(WebservicesMetaData.class, wsMetaData);
+            }
+         }
+         catch (Exception ex)
+         {
+            throw new WSFDeploymentException(ex);
+         }
+      }
+      return wsMetaData;
+   }
+
+   private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit)
+   {
+      UnifiedVirtualFile wsFile = null;
+      if (unit instanceof VFSDeploymentUnit)
+      {
+         VirtualFile vf = ((VFSDeploymentUnit)unit).getMetaDataFile("webservices.xml");
+         wsFile = vf != null ? new VirtualFileAdaptor(vf) : null;
+      }
+      return wsFile;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,40 @@
+/*
+ * 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.container.jboss50.deployer;
+
+//$Id$
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * An interface for all web service deployer hooks 
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @since 24-Apr-2007
+ */
+public interface DeployerHook
+{
+   void deploy(DeploymentUnit unit) throws DeploymentException;
+
+   void undeploy(DeploymentUnit unit);
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,61 @@
+/*
+ * 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.container.jboss50.deployer;
+
+// $Id$
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.wsf.spi.deployment.Deployment;
+
+/**
+ * @author Heiko.Braun at jboss.com
+ * @author Thomas.Diesler at jboss.com
+ */
+public abstract class DeployerHookPostJSE extends AbstractDeployerHookJSE
+{
+   /**
+    * The deployment should be created in phase 1.
+    */
+   public Deployment createDeployment(DeploymentUnit unit)
+   {
+      Deployment dep = unit.getAttachment(Deployment.class);
+      if (null == dep)
+         throw new IllegalStateException("spi.Deployment missing. It should be created in Phase 1");
+
+      return dep;
+   }
+
+   /**
+    * A phase 2 deployer hook needs to reject first-place
+    * JSE deployments and wait for those that are re-written.
+    * We rely on the fact that spi.Deployment is created in phase 1.    
+    */
+   @Override
+   public boolean isWebServiceDeployment(DeploymentUnit unit)
+   {
+      if (super.isWebServiceDeployment(unit) == false)
+         return false;
+
+      Deployment deployment = unit.getAttachment(Deployment.class);
+      return deployment != null;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookPostJSE.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,106 @@
+/*
+ * 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.container.jboss50.deployer;
+
+//$Id$
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.serviceref.VirtualFileAdaptor;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+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.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * A deployer JAXRPC EJB21 Endpoints
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB
+{
+   /** Get the deployemnt type this deployer can handle
+    */
+   public DeploymentType getDeploymentType()
+   {
+      return DeploymentType.JAXRPC_EJB21;
+   }
+
+   @Override
+   public Deployment createDeployment(DeploymentUnit unit)
+   {
+      ArchiveDeployment dep = newDeployment(unit);
+      dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+      dep.setRuntimeClassLoader(unit.getClassLoader());
+      dep.setType(getDeploymentType());
+
+      Service service = dep.getService();
+
+      JBossMetaData jbmd = unit.getAttachment(JBossMetaData.class);
+      if (jbmd == null)
+         throw new IllegalStateException("Deployment unit does not contain application meta data");
+
+      WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
+      if (wsMetaData == null)
+         throw new IllegalStateException("Deployment unit does not contain webservices meta data");
+
+      // Copy the attachments
+      dep.addAttachment(WebservicesMetaData.class, wsMetaData);
+      dep.addAttachment(JBossMetaData.class, jbmd);
+
+      for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
+      {
+         for (PortComponentMetaData pcmd : wsd.getPortComponents())
+         {
+            String ejbLink = pcmd.getEjbLink();
+            if (ejbLink == null)
+               throw new IllegalStateException("ejb-link cannot be null");
+
+            JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbLink);
+            if (beanMetaData == null)
+               throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink);
+
+            String ejbClass = beanMetaData.getEjbClass();
+
+            // Create the endpoint
+            Endpoint ep = newEndpoint(ejbClass);
+            ep.setShortName(ejbLink);
+            service.addEndpoint(ep);
+         }
+      }
+      return dep;
+   }
+
+   @Override
+   public boolean isWebServiceDeployment(DeploymentUnit unit)
+   {
+      WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
+      return wsMetaData != null && unit.getAllMetaData(JBossMetaData.class).size() > 0;
+   }
+}
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,74 @@
+/*
+ * 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.container.jboss50.deployer;
+
+// $Id$
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState;
+
+/**
+ * A deployer JAXRPC JSE Endpoints
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class JAXRPCDeployerHookPostJSE extends DeployerHookPostJSE
+{
+
+   /**
+    * Expects the 'create' step to be executed in
+    * {@link org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookPreJSE}
+    * and executes the 'start' step.
+    *
+    */
+   public void deploy(DeploymentUnit unit) throws DeploymentException
+   {
+      if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
+      {
+         Deployment dep = getDeployment(unit);
+         if(null==dep || DeploymentState.CREATED != dep.getState())
+            throw new DeploymentException("Create step is missing");
+
+         // execute the 'start' step
+         getWsfRuntime().start(dep);          
+      }
+   }
+
+   /**
+    * Get the deployment type this deployer can handle
+    */
+   public Deployment.DeploymentType getDeploymentType()
+   {
+      return Deployment.DeploymentType.JAXRPC_JSE;
+   }
+
+   @Override
+   public boolean isWebServiceDeployment(DeploymentUnit unit)
+   {
+      WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
+      return (wsMetaData!=null && super.isWebServiceDeployment(unit));
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,130 @@
+/*
+ * 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.container.jboss50.deployer;
+
+//$Id$
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.serviceref.VirtualFileAdaptor;
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+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.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * A deployer JAXRPC JSE Endpoints
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE
+{
+
+
+   public void undeploy(DeploymentUnit unit)
+   {
+      // the JAXRPCDeployerHookPostJSE deals with undeployments
+   }
+
+   /** Get the deployemnt type this deployer can handle
+    */
+   public DeploymentType getDeploymentType()
+   {
+      return DeploymentType.JAXRPC_JSE;
+   }
+
+   /**
+    * Create an endpoint for every servlet-link in webservices.xml
+    */
+   @Override
+   public Deployment createDeployment(DeploymentUnit unit)
+   {
+      ArchiveDeployment dep = newDeployment(unit);
+      dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+      dep.setRuntimeClassLoader(null); 
+      dep.setType(getDeploymentType());
+
+      Service service = dep.getService();
+
+      JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
+      if (webMetaData == null)
+         throw new IllegalStateException("Deployment unit does not contain web meta data");
+
+      WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
+      if (wsMetaData == null)
+         throw new IllegalStateException("Deployment unit does not contain webservices meta data");
+
+      // Copy the attachments
+      dep.addAttachment(WebservicesMetaData.class, wsMetaData);
+      dep.addAttachment(JBossWebMetaData.class, webMetaData);
+
+      for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
+      {
+         for (PortComponentMetaData pcmd : wsd.getPortComponents())
+         {
+            String servletLink = pcmd.getServletLink();
+            if (servletLink == null)
+               throw new IllegalStateException("servlet-link cannot be null");
+
+            ServletMetaData servlet = getServletForName(webMetaData, servletLink);
+            String targetBean = getTargetBean(servlet);
+
+            // Create the endpoint
+            Endpoint ep = newEndpoint(targetBean);
+            ep.setShortName(servletLink);
+            service.addEndpoint(ep);
+         }
+      }
+
+      return dep;
+   }
+
+   private ServletMetaData getServletForName(JBossWebMetaData wmd, String servletLink)
+   {
+      for (JBossServletMetaData servlet : wmd.getServlets())
+      {
+         if (servletLink.equals(servlet.getName()))
+         {
+            return servlet;
+         }
+      }
+      throw new IllegalStateException("Cannot find servlet for link: " + servletLink);
+   }
+
+   @Override
+   public boolean isWebServiceDeployment(DeploymentUnit unit)
+   {
+      if (super.isWebServiceDeployment(unit) == false)
+         return false;
+
+      WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
+      return wsMetaData != null;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,128 @@
+/*
+ * 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.container.jboss50.deployer;
+
+//$Id$
+
+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 javax.jws.WebService;
+import javax.xml.ws.WebServiceProvider;
+import java.util.Iterator;
+
+/**
+ * A deployer JAXWS EJB3 Endpoints
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB
+{
+   /** Get the deployemnt type this deployer can handle
+    */
+   public DeploymentType getDeploymentType()
+   {
+      return DeploymentType.JAXWS_EJB3;
+   }
+
+   @Override
+   public Deployment createDeployment(DeploymentUnit unit)
+   {
+      ArchiveDeployment dep = newDeployment(unit);
+      dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+      dep.setRuntimeClassLoader(unit.getClassLoader());
+      dep.setType(getDeploymentType());
+
+      Service service = dep.getService();
+
+      Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
+      if (ejb3Deployment == null)
+         throw new IllegalStateException("Deployment unit does not contain ejb3 deployment");
+
+      // Copy the attachments
+      dep.addAttachment(Ejb3Deployment.class, ejb3Deployment);
+
+      WebServiceDeployment apiAdapter = WebServiceDeploymentApiAdapter.createInstance(ejb3Deployment);
+      Iterator<WebServiceDeclaration> it = apiAdapter.getServiceEndpoints().iterator();
+      while (it.hasNext())
+      {
+         WebServiceDeclaration container = it.next();
+         if (isWebServiceBean(container))
+         {
+            String ejbName = container.getComponentName();
+            String epBean = container.getComponentClassName();
+
+            // Create the endpoint
+            Endpoint ep = newEndpoint(epBean);
+            ep.setShortName(ejbName);
+            service.addEndpoint(ep);
+         }
+      }
+
+      return dep;
+   }
+
+   @Override
+   public boolean isWebServiceDeployment(DeploymentUnit unit)
+   {
+      Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
+      if (ejb3Deployment == null)
+         return false;
+
+      boolean isWebServiceDeployment = false;
+
+      WebServiceDeployment apiAdapter = WebServiceDeploymentApiAdapter.createInstance(ejb3Deployment);
+      Iterator<WebServiceDeclaration> it = apiAdapter.getServiceEndpoints().iterator();
+      while (it.hasNext())
+      {
+         WebServiceDeclaration container = it.next();
+         if (isWebServiceBean(container))
+         {
+            isWebServiceDeployment = true;
+            break;
+         }
+      }
+
+      return isWebServiceDeployment;
+   }
+
+   private boolean isWebServiceBean(WebServiceDeclaration container)
+   {
+      boolean isWebServiceBean = false;
+      boolean isWebService = container.getAnnotation(WebService.class) != null;
+      boolean isWebServiceProvider = container.getAnnotation(WebServiceProvider.class) != null;
+      isWebServiceBean = isWebService || isWebServiceProvider;
+
+      return isWebServiceBean;
+   }
+}
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,77 @@
+/*
+ * 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.container.jboss50.deployer;
+
+// $Id$
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState;
+
+/**
+ * @author Heiko.Braun at jboss.com
+ * @version $Revision$
+ */
+public class JAXWSDeployerHookPostJSE extends DeployerHookPostJSE
+{
+
+   /**
+    * Expects the 'create' step to be executed in
+    * {@link org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookPreJSE} and
+    * executes the 'start' step.
+    *
+    */
+   public void deploy(DeploymentUnit unit) throws DeploymentException
+   {
+      if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
+      {
+         Deployment dep = getDeployment(unit);
+         if (null == dep || DeploymentState.CREATED != dep.getState())
+            throw new DeploymentException("Create step failed");
+
+         // execute the 'start' step
+         getWsfRuntime().start(dep); 
+      }
+   }
+
+   /**
+    * Get the deployment type this deployer can handle
+    */
+   public Deployment.DeploymentType getDeploymentType()
+   {
+      return Deployment.DeploymentType.JAXWS_JSE;
+   }
+
+   /**
+    * Reject JAX-RPC deployments.
+    *
+    * @param unit
+    * @return
+    */
+   public boolean isWebServiceDeployment(DeploymentUnit unit)
+   {
+      WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);// JAX-RPC artefact
+      return (wsMetaData == null && super.isWebServiceDeployment(unit));
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,143 @@
+/*
+ * 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.container.jboss50.deployer;
+
+//$Id$
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.metadata.serviceref.VirtualFileAdaptor;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Service;
+
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceProvider;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A deployer JAXWS JSE Endpoints
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class JAXWSDeployerHookPreJSE extends AbstractDeployerHookJSE
+{
+
+
+   public void undeploy(DeploymentUnit unit)
+   {
+      // the  JAXWSDeployerHookPostJSE deals with undeployment
+   }
+
+   /** Get the deployment type this deployer can handle
+    */
+   public DeploymentType getDeploymentType()
+   {
+      return DeploymentType.JAXWS_JSE;
+   }
+
+   @Override
+   public Deployment createDeployment(DeploymentUnit unit)
+   {
+      ArchiveDeployment dep = newDeployment(unit);
+      dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));     
+      dep.setType(getDeploymentType());
+
+      Service service = dep.getService();
+
+      JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
+      if (webMetaData == null)
+         throw new IllegalStateException("Deployment unit does not contain web meta data");
+
+      // Copy the attachments
+      dep.addAttachment(JBossWebMetaData.class, webMetaData);
+
+      List<ServletMetaData> servlets = getRelevantServlets(webMetaData, unit.getClassLoader());
+      for (ServletMetaData servlet : servlets)
+      {
+         String servletName = servlet.getName();
+         String targetBean = getTargetBean(servlet);
+
+         // Create the endpoint
+         Endpoint ep = newEndpoint(targetBean);
+         ep.setShortName(servletName);
+         service.addEndpoint(ep);
+      }
+
+      return dep;
+   }
+
+   @Override
+   public boolean isWebServiceDeployment(DeploymentUnit unit)
+   {
+      if (super.isWebServiceDeployment(unit) == false)
+         return false;
+
+      boolean isWebServiceDeployment = false;
+      try
+      {
+         JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
+         List<ServletMetaData> servlets = getRelevantServlets(webMetaData, unit.getClassLoader());
+         isWebServiceDeployment = servlets.size() > 0;
+      }
+      catch (Exception ex)
+      {
+         log.error("Cannot process web deployment", ex);
+      }
+
+      return isWebServiceDeployment;
+   }
+
+   private List<ServletMetaData> getRelevantServlets(JBossWebMetaData webMetaData, ClassLoader loader)
+   {
+      List<ServletMetaData> servlets = new ArrayList<ServletMetaData>();
+      for (ServletMetaData servlet : webMetaData.getServlets())
+      {
+         String servletClassName = getTargetBean(servlet);
+
+         // Skip JSPs
+         if (servletClassName == null || servletClassName.length() == 0)
+            continue;
+
+         try
+         {
+            Class<?> servletClass = loader.loadClass(servletClassName.trim());
+            boolean isWebService = servletClass.isAnnotationPresent(WebService.class);
+            boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class);
+            if (isWebService || isWebServiceProvider)
+               servlets.add(servlet);
+         }
+         catch (ClassNotFoundException ex)
+         {
+            log.warn("Cannot load servlet class: " + servletClassName);
+            continue;
+         }
+      }
+      return servlets;
+   }
+}
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,47 @@
+/*
+ * 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.container.jboss50.deployer;
+
+import org.jboss.ejb.deployers.EjbDeployment;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+
+//$Id$
+
+/**
+ * This web service deployer for EJB
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @since 24-Apr-2007
+ */
+public class WebServiceDeployerEJB extends AbstractWebServiceDeployer
+{
+   public WebServiceDeployerEJB()
+   {
+      // Output of the EJBDeployer
+      addInput(EjbDeployment.class);
+      // Output of the EJB3Deployer
+      addInput(Ejb3Deployment.class);
+      // Input for the TomcatDeployer
+      addOutput(JBossWebMetaData.class);
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,38 @@
+/*
+ * 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.container.jboss50.deployer;
+
+//$Id$
+
+import org.jboss.web.deployers.WarDeployment;
+
+/**
+ * @author Heiko.Braun at jboss.com
+ */
+public class WebServiceDeployerPostJSE extends AbstractWebServiceDeployer
+{
+   public WebServiceDeployerPostJSE()
+   {
+      // Output from the TomcatDeployer
+      addInput(WarDeployment.class);
+   }
+}
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,53 @@
+/*
+ * 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.container.jboss50.deployer;
+
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+
+//$Id$
+
+/**
+ * This web service deployer for JSE
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @since 24-Apr-2007
+ */
+public class WebServiceDeployerPreJSE extends AbstractWebServiceDeployer
+{
+   private int relOrderWar;
+
+   public WebServiceDeployerPreJSE()
+   {
+      addInput(JBossWebMetaData.class);
+   }
+
+   public void setRelOrderWar(int relOrderWar)
+   {
+      this.relOrderWar = relOrderWar;
+   }
+
+   @Override
+   public int getRelativeOrder()
+   {
+      return relOrderWar - 1;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,52 @@
+/*
+ * 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.container.jboss50.deployer;
+
+//$Id$
+
+/**
+ * The main web service deployer
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @since 24-Apr-2007
+ */
+public class WebServiceMainDeployer extends AbstractWebServiceDeployer
+{
+   private int relOrderJSE;
+   private int relOrderEJB;
+   
+   public void setRelOrderEJB(int relOrderEJB)
+   {
+      this.relOrderEJB = relOrderEJB;
+   }
+   
+   public void setRelOrderJSE(int relOrderJSE)
+   {
+      this.relOrderJSE = relOrderJSE;
+   }
+   
+   @Override
+   public int getRelativeOrder()
+   {
+      return Math.max(relOrderEJB, relOrderJSE) + 1;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceMainDeployer.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,66 @@
+/*
+ * 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.container.jboss50.deployment;
+
+// $Id$
+
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+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;
+
+/**
+ * Determines the correct runtime loader for per deployment type
+ * and makes it available through the {@link Deployment}.
+ *
+ * @author Heiko.Braun at jboss.com
+ */
+public class RuntimeLoaderDeploymentAspect extends DeploymentAspect
+{
+
+   public void start(Deployment dep, WSFRuntime runtime)
+   {
+      // EJB3 endpoints
+      if (dep.getAttachment(Ejb3Deployment.class) != null)
+      {
+         dep.setRuntimeClassLoader(dep.getInitialClassLoader());
+      }
+      // EJB21 endpoints
+      else if (dep.getAttachment(JBossMetaData.class) != null)
+      {
+         dep.setRuntimeClassLoader(dep.getInitialClassLoader());
+      }
+      // JSE endpoints
+      else if (dep.getAttachment(JBossWebMetaData.class) != null)
+      {
+         JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class);
+         ClassLoader classLoader = webMetaData.getContextLoader();
+         dep.setRuntimeClassLoader(classLoader);
+      }
+      else
+      {
+         throw new IllegalArgumentException("Unable to determine runtime loader");
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,114 @@
+/*
+ * 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.container.jboss50.deployment.metadata;
+
+//$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.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+import org.jboss.wsf.spi.transport.HttpSpec;
+
+import java.net.URL;
+
+/**
+ * Build container independent deployment info.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2006
+ */
+public class ContainerMetaDataAdapter
+{
+   // logging support
+   private static Logger log = Logger.getLogger(ContainerMetaDataAdapter.class);
+
+   private EJBArchiveMetaDataAdapterEJB3 ejbMetaDataAdapterEJB3 = new EJBArchiveMetaDataAdapterEJB3();
+   private EJBArchiveMetaDataAdapterEJB21 ejbMetaDataAdapterEJB21 = new EJBArchiveMetaDataAdapterEJB21();
+   private JSEArchiveMetaDataAdapter webMetaDataAdapter = new JSEArchiveMetaDataAdapter();
+
+   public void setEjbMetaDataAdapterEJB21(EJBArchiveMetaDataAdapterEJB21 adapter)
+   {
+      this.ejbMetaDataAdapterEJB21 = adapter;
+   }
+
+   public void setEjbMetaDataAdapterEJB3(EJBArchiveMetaDataAdapterEJB3 adapter)
+   {
+      this.ejbMetaDataAdapterEJB3 = adapter;
+   }
+
+   public void setWebMetaDataAdapter(JSEArchiveMetaDataAdapter adapter)
+   {
+      this.webMetaDataAdapter = adapter;
+   }
+
+   public void buildContainerMetaData(Deployment dep, DeploymentUnit unit)
+   {
+      dep.addAttachment(DeploymentUnit.class, unit);
+
+      try
+      {
+         // JSE endpoints
+         if (unit.getAttachment(JBossWebMetaData.class) != null)
+         {
+            JSEArchiveMetaData webMetaData = webMetaDataAdapter.buildMetaData(dep, unit);
+            if (webMetaData != null)
+               dep.addAttachment(JSEArchiveMetaData.class, webMetaData);
+
+            if (dep instanceof ArchiveDeployment)
+            {
+               URL webURL = ((ArchiveDeployment)dep).getRootFile().toURL();
+               dep.setProperty(HttpSpec.PROPERTY_WEBAPP_URL, webURL);
+            }
+         }
+         
+         // EJB3 endpoints
+         else if (unit.getAttachment(Ejb3Deployment.class) != null)
+         {
+            EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB3.buildMetaData(dep, unit);
+            if (ejbMetaData != null)
+               dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
+         }
+         
+         // EJB21 endpoints
+         else if (unit.getAttachment(JBossMetaData.class) != null)
+         {
+            EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB21.buildMetaData(dep, unit);
+            if (ejbMetaData != null)
+               dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
+         }
+      }
+      catch (RuntimeException rte)
+      {
+         throw rte;
+      }
+      catch (Exception ex)
+      {
+         throw new IllegalStateException(ex);
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataAdapter.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,55 @@
+/*
+ * 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.container.jboss50.deployment.metadata;
+
+//$Id$
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.WSFRuntime;
+
+/**
+ * A deployer that builds the UnifiedDeploymentInfo 
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class ContainerMetaDataDeploymentAspect extends DeploymentAspect
+{
+   private ContainerMetaDataAdapter metaDataAdapter = new ContainerMetaDataAdapter();
+
+   public void setMetaDataAdapter(ContainerMetaDataAdapter adapter)
+   {
+      this.metaDataAdapter = adapter;
+   }
+
+   @Override
+   public void create(Deployment dep, WSFRuntime runtime)
+   {
+      DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
+      if (unit == null)
+         throw new IllegalStateException("Cannot obtain deployment unit");
+
+      metaDataAdapter.buildContainerMetaData(dep, unit);
+   }
+}
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/ContainerMetaDataDeploymentAspect.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,176 @@
+/*
+ * 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.container.jboss50.deployment.metadata;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+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.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
+import org.jboss.metadata.javaee.spec.PortComponent;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData.PublishLocationAdapter;
+
+/**
+ * Build container independent application meta data 
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2006
+ */
+public class EJBArchiveMetaDataAdapterEJB21
+{
+   // logging support
+   private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB21.class);
+
+   public EJBArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit)
+   {
+      JBossMetaData jbossMetaData = unit.getAttachment(JBossMetaData.class);
+      dep.addAttachment(JBossMetaData.class, jbossMetaData);
+      
+      EJBArchiveMetaData ejbMetaData = new EJBArchiveMetaData();
+      buildEnterpriseBeansMetaData(ejbMetaData, jbossMetaData);
+      buildWebservicesMetaData(ejbMetaData, jbossMetaData);
+      ejbMetaData.setSecurityDomain(jbossMetaData.getSecurityDomain());
+      
+      return ejbMetaData;
+   }
+
+   private void buildEnterpriseBeansMetaData(EJBArchiveMetaData ejbMetaData, JBossMetaData jbossMetaData)
+   {
+      List<EJBMetaData> targetBeans = new ArrayList<EJBMetaData>();
+      JBossEnterpriseBeansMetaData sourceBeans = jbossMetaData.getEnterpriseBeans();
+      Iterator<JBossEnterpriseBeanMetaData> it = sourceBeans.iterator();
+      while (it.hasNext())
+      {
+         JBossEnterpriseBeanMetaData bmd = it.next();
+         buildBeanMetaData(targetBeans, bmd);
+      }
+      ejbMetaData.setEnterpriseBeans(targetBeans);
+   }
+
+   private void buildWebservicesMetaData(EJBArchiveMetaData ejbMetaData, JBossMetaData jbossMetaData)
+   {
+      WebservicesMetaData webservices = jbossMetaData.getWebservices();
+      if (webservices != null)
+      {
+         String contextRoot = webservices.getContextRoot();
+         ejbMetaData.setWebServiceContextRoot(contextRoot);
+         
+         ejbMetaData.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
+
+         WebserviceDescriptionsMetaData wsDescriptions = webservices.getWebserviceDescriptions();
+         if (wsDescriptions != null)
+         {
+            if (wsDescriptions.size() > 1)
+               log.warn("Multiple <webservice-description> elements not supported");
+
+            if (wsDescriptions.size() > 0)
+            {
+               WebserviceDescriptionMetaData wsd = wsDescriptions.iterator().next();
+               ejbMetaData.setConfigName(wsd.getConfigName());
+               ejbMetaData.setConfigFile(wsd.getConfigFile());
+            }
+         }
+      }
+   }
+
+   private PublishLocationAdapter getPublishLocationAdpater(final WebservicesMetaData wsMetaData)
+   {
+      return new PublishLocationAdapter()
+      {
+         public String getWsdlPublishLocationByName(String name)
+         {
+            String wsdlPublishLocation = null;
+            WebserviceDescriptionsMetaData wsDescriptions = wsMetaData.getWebserviceDescriptions();
+            if (wsDescriptions != null && wsDescriptions.get(name) != null)
+            {
+               WebserviceDescriptionMetaData wsdMetaData = wsDescriptions.get(name);
+               wsdlPublishLocation = wsdMetaData.getWsdlPublishLocation();
+            }
+            return wsdlPublishLocation;
+         }
+      };
+   }
+
+   private EJBMetaData buildBeanMetaData(List<EJBMetaData> ejbBeans, JBossEnterpriseBeanMetaData jbossBeansMetaData)
+   {
+      EJBMetaData targetBean = null;
+      if (jbossBeansMetaData.isSession())
+      {
+         targetBean = new SLSBMetaData();
+         JBossSessionBeanMetaData jbossSessionBean = (JBossSessionBeanMetaData)jbossBeansMetaData;
+         
+         targetBean.setEjbName(jbossSessionBean.getEjbName());
+         targetBean.setEjbClass(jbossSessionBean.getEjbClass());
+         targetBean.setServiceEndpointInterface(jbossSessionBean.getServiceEndpoint());
+         targetBean.setHome(jbossSessionBean.getHome());
+         targetBean.setLocalHome(jbossSessionBean.getLocalHome());
+         targetBean.setJndiName(jbossSessionBean.determineJndiName());
+         targetBean.setLocalJndiName(jbossBeansMetaData.determineLocalJndiName());
+         
+         PortComponent pcmd = jbossSessionBean.getPortComponent();
+         if (pcmd != null)
+         {
+            targetBean.setPortComponentName(pcmd.getPortComponentName());
+            targetBean.setPortComponentURI(pcmd.getPortComponentURI());
+            EJBSecurityMetaData smd = new EJBSecurityMetaData();
+            smd.setAuthMethod(pcmd.getAuthMethod());
+            smd.setTransportGuarantee(pcmd.getTransportGuarantee());
+            smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
+            targetBean.setSecurityMetaData(smd);
+         }
+      }
+      else if (jbossBeansMetaData.isMessageDriven())
+      {
+         targetBean = new MDBMetaData();
+         JBossMessageDrivenBeanMetaData jbossMessageBean = (JBossMessageDrivenBeanMetaData)jbossBeansMetaData;
+         
+         targetBean.setEjbName(jbossMessageBean.getEjbName());
+         targetBean.setEjbClass(jbossMessageBean.getEjbClass());
+         //targetBean.setServiceEndpointInterface(???);
+         //targetBean.setJndiName(???);
+         targetBean.setLocalJndiName(jbossBeansMetaData.getLocalJndiName());
+         ((MDBMetaData)targetBean).setDestinationJndiName(jbossMessageBean.getDestinationJndiName());
+      }
+
+      if (targetBean != null)
+         ejbBeans.add(targetBean);
+      
+      return targetBean;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB21.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,188 @@
+/*
+ * 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.container.jboss50.deployment.metadata;
+
+// $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.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;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Build container independent application meta data 
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 14-Apr-2007
+ */
+public class EJBArchiveMetaDataAdapterEJB3
+{
+   // logging support
+   private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB3.class);
+
+   public EJBArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit)
+   {     
+      EJBArchiveMetaData umd = new EJBArchiveMetaData();
+
+      WebServiceDeployment apiAdapter = WebServiceDeploymentApiAdapter.createInstance(
+        unit.getAttachment(Ejb3Deployment.class)
+      );
+      buildEnterpriseBeansMetaData(umd, apiAdapter);
+
+      JBossMetaData jbMetaData = unit.getAttachment(JBossMetaData.class);
+      if (jbMetaData != null)
+         buildWebservicesMetaData(umd, jbMetaData);
+
+      return umd;
+   }
+
+   private void buildWebservicesMetaData(EJBArchiveMetaData ejbMetaData, JBossMetaData jbMetaData)
+   {
+      WebservicesMetaData wsMetaData = jbMetaData.getWebservices();
+      if (wsMetaData != null)
+      {
+         String contextRoot = wsMetaData.getContextRoot();
+         ejbMetaData.setWebServiceContextRoot(contextRoot);
+
+         ejbMetaData.setPublishLocationAdapter(getPublishLocationAdpater(wsMetaData));
+
+         WebserviceDescriptionsMetaData wsDescriptions = wsMetaData.getWebserviceDescriptions();
+         if (wsDescriptions != null)
+         {
+            if (wsDescriptions.size() > 1)
+               log.warn("Multiple <webservice-description> elements not supported");
+
+            if (wsDescriptions.size() > 0)
+            {
+               WebserviceDescriptionMetaData wsd = wsDescriptions.iterator().next();
+               ejbMetaData.setConfigName(wsd.getConfigName());
+               ejbMetaData.setConfigFile(wsd.getConfigFile());
+            }
+         }
+      }
+   }
+
+   private void buildEnterpriseBeansMetaData(EJBArchiveMetaData jarMetaData, WebServiceDeployment ejb3Deployment)
+   {
+      List<EJBMetaData> ejbMetaDataList = new ArrayList<EJBMetaData>();
+      Iterator<WebServiceDeclaration> it = ejb3Deployment.getServiceEndpoints().iterator();
+      while (it.hasNext())
+      {
+         WebServiceDeclaration container = it.next();
+
+         // TODO: Add PortComponent parsing to EJBDescriptorHandler
+         PortComponentSpec pcMetaData = container.getAnnotation(PortComponentSpec.class);
+         MessageDriven mdbMetaData = container.getAnnotation(MessageDriven.class);
+
+         EJBMetaData ejbMetaData = null;
+
+         if(mdbMetaData!=null)
+         {
+            ejbMetaData = new MDBMetaData();
+
+            ActivationConfigProperty[] props = mdbMetaData.activationConfig();
+            if (props != null)
+            {
+               String destination = getActivationProperty("destination", props);
+               if (destination != null)
+               {                  
+                  ((MDBMetaData)ejbMetaData).setDestinationJndiName(destination);
+               }
+            }
+         }
+         else
+         {
+            ejbMetaData = new SLSBMetaData();
+         }
+
+         if (ejbMetaData != null)
+         {
+            ejbMetaData.setEjbName(container.getComponentName());
+            ejbMetaData.setEjbClass(container.getComponentClassName());
+
+            if (pcMetaData != null)
+            {
+               ejbMetaData.setPortComponentName(pcMetaData.portComponentName());
+               ejbMetaData.setPortComponentURI(pcMetaData.portComponentURI());
+               EJBSecurityMetaData smd = new EJBSecurityMetaData();
+               smd.setAuthMethod(pcMetaData.authMethod());
+               smd.setTransportGuarantee(pcMetaData.transportGuarantee());
+               smd.setSecureWSDLAccess(pcMetaData.secureWSDLAccess());
+               ejbMetaData.setSecurityMetaData(smd);
+            }
+            
+            ejbMetaDataList.add(ejbMetaData);
+         }
+      }
+      
+      jarMetaData.setEnterpriseBeans(ejbMetaDataList);
+   }
+
+   private String getActivationProperty(String name, ActivationConfigProperty[] props)
+   {
+      String result = null;
+      for(ActivationConfigProperty p : props)
+      {
+         if(p.propertyName().equals(name))
+         {
+            result = p.propertyValue();
+            break;
+         }
+      }
+
+      return result;
+   }
+
+   private PublishLocationAdapter getPublishLocationAdpater(final WebservicesMetaData wsMetaData)
+   {
+      return new PublishLocationAdapter() {
+         public String getWsdlPublishLocationByName(String name)
+         {
+            String wsdlPublishLocation = null;
+            WebserviceDescriptionsMetaData wsDescriptions = wsMetaData.getWebserviceDescriptions();
+            if (wsDescriptions != null && wsDescriptions.get(name) != null)
+            {
+               WebserviceDescriptionMetaData wsdMetaData = wsDescriptions.get(name);
+               wsdlPublishLocation = wsdMetaData.getWsdlPublishLocation();
+            }
+            return wsdlPublishLocation;
+         }
+      };
+   }
+
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/EJBArchiveMetaDataAdapterEJB3.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,206 @@
+/*
+ * 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.container.jboss50.deployment.metadata;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
+import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
+import org.jboss.metadata.web.spec.ServletMappingMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData.PublishLocationAdapter;
+import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection;
+
+/**
+ * Build container independent web meta data
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2006
+ */
+public class JSEArchiveMetaDataAdapter
+{
+   // logging support
+   private static Logger log = Logger.getLogger(JSEArchiveMetaDataAdapter.class);
+   
+   public JSEArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit)
+   {
+      String contextRoot = null;
+      
+      JBossWebMetaData jbossWebMetaData = unit.getAttachment(JBossWebMetaData.class);
+      dep.addAttachment(JBossWebMetaData.class, jbossWebMetaData);
+
+      if (unit.getParent() != null)
+      {
+         JBossAppMetaData appmd = unit.getParent().getAttachment(JBossAppMetaData.class);
+         if (appmd != null)
+         {
+            ModuleMetaData module = appmd.getModule(dep.getSimpleName());
+            if (module != null)
+            {
+               WebModuleMetaData web = (WebModuleMetaData) module.getValue();
+               contextRoot = web.getContextRoot();
+            }
+         }
+      }
+      
+      if (contextRoot == null)
+         contextRoot = jbossWebMetaData.getContextRoot();
+      
+      JSEArchiveMetaData umd = new JSEArchiveMetaData();
+      umd.setContextRoot(contextRoot);
+      umd.setServletMappings(getServletMappings(jbossWebMetaData));
+      umd.setServletClassNames(getServletClassMap(jbossWebMetaData));
+      umd.setSecurityDomain(jbossWebMetaData.getSecurityDomain());
+      umd.setPublishLocationAdapter(getPublishLocationAdpater(jbossWebMetaData));
+      umd.setSecurityMetaData(getSecurityMetaData(jbossWebMetaData.getSecurityContraints()));
+
+      setConfigNameAndFile(umd, jbossWebMetaData);
+      
+      return umd;
+   }
+
+   private void setConfigNameAndFile(JSEArchiveMetaData umd, JBossWebMetaData jbossWebMetaData)
+   {
+      String configName = null;
+      String configFile = null;
+      
+      WebserviceDescriptionsMetaData wsDescriptions = jbossWebMetaData.getWebserviceDescriptions();
+      if (wsDescriptions != null && wsDescriptions.size() > 1)
+         log.warn("Multiple <webservice-description> elements not supported");
+
+      if (wsDescriptions != null && wsDescriptions.size() > 0)
+      {
+         WebserviceDescriptionMetaData wsd = wsDescriptions.iterator().next();
+         configName = wsd.getConfigName();
+         configFile = wsd.getConfigFile();
+      }
+
+      List<ParamValueMetaData> contextParams = jbossWebMetaData.getContextParams();
+      if (contextParams != null)
+      {
+         for (ParamValueMetaData ctxParam : contextParams)
+         {
+            if (ctxParam.getParamName().equals("jbossws-config-name"))
+               configName = ctxParam.getParamValue();
+            if (ctxParam.getParamName().equals("jbossws-config-file"))
+               configFile = ctxParam.getParamValue();
+         }
+      }
+      
+      umd.setConfigName(configName);
+      umd.setConfigFile(configFile);
+   }
+
+   private PublishLocationAdapter getPublishLocationAdpater(final JBossWebMetaData wmd)
+   {
+      return new PublishLocationAdapter()
+      {
+         public String getWsdlPublishLocationByName(String name)
+         {
+            WebserviceDescriptionsMetaData wsdmd = wmd.getWebserviceDescriptions();
+            WebserviceDescriptionMetaData wsmd = wsdmd.get(name);
+            String location = null;
+            if (wsmd != null)
+               location = wsmd.getWsdlPublishLocation();
+            return location;
+         }
+      };
+   }
+
+   protected List<JSESecurityMetaData> getSecurityMetaData(final List<SecurityConstraintMetaData> securityConstraints)
+   {
+      ArrayList<JSESecurityMetaData> unifiedsecurityMetaData = new ArrayList<JSESecurityMetaData>();
+      if (securityConstraints != null)
+      {
+         for (SecurityConstraintMetaData securityMetaData : securityConstraints)
+         {
+            JSESecurityMetaData current = new JSESecurityMetaData();
+            unifiedsecurityMetaData.add(current);
+
+            current.setTransportGuarantee(securityMetaData.getTransportGuarantee().name());
+
+            WebResourceCollectionsMetaData resources = securityMetaData.getResourceCollections();
+            for (WebResourceCollectionMetaData webResource : resources)
+            {
+               JSEResourceCollection currentResource = current.addWebResource(webResource.getName());
+               for (String currentPattern : webResource.getUrlPatterns())
+               {
+                  currentResource.addPattern(currentPattern);
+               }
+            }
+         }
+      }
+      return unifiedsecurityMetaData;
+   }
+
+   private Map<String, String> getServletMappings(JBossWebMetaData wmd)
+   {
+      Map<String, String> mappings = new HashMap<String, String>();
+      List<ServletMappingMetaData> smappings = wmd.getServletMappings();
+      if (smappings != null)
+      {
+         for(ServletMappingMetaData mapping : smappings)
+         {
+            // FIXME - Add support for multiple mappings
+            mappings.put(mapping.getServletName(), mapping.getUrlPatterns().get(0));
+         }
+      }
+      return mappings;
+   }
+
+   private Map<String, String> getServletClassMap(JBossWebMetaData wmd)
+   {
+      Map<String, String> mappings = new HashMap<String, String>();
+      JBossServletsMetaData servlets = wmd.getServlets();
+      if (servlets != null)
+      {
+         for (ServletMetaData servlet : servlets)
+         {
+            // Skip JSPs
+            if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0)
+               continue;
+   
+            mappings.put(servlet.getName(), servlet.getServletClass());
+         }
+      }
+      return mappings;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/metadata/JSEArchiveMetaDataAdapter.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,58 @@
+/*
+ * 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.container.jboss50.deployment.tomcat;
+
+//$Id$
+
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.spi.WSFRuntime;
+
+/**
+ * A deployer that modifies the web.xml meta data 
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class ModifyWebMetaDataDeploymentAspect extends DeploymentAspect
+{
+   private WebMetaDataModifier webMetaDataModifier;
+   
+   public void setWebMetaDataModifier(WebMetaDataModifier webMetaDataModifier)
+   {
+      this.webMetaDataModifier = webMetaDataModifier;
+   }
+
+   @Override
+   public void create(Deployment dep, WSFRuntime runtime)
+   {
+      try
+      {
+         webMetaDataModifier.modifyMetaData(dep);         
+      }
+      catch (Exception ex)
+      {
+         WSFDeploymentException.rethrow(ex);
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,38 @@
+/*
+ * 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.container.jboss50.deployment.tomcat;
+
+import java.net.URL;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author Heiko.Braun at jboss.com
+ *         Created: Jul 19, 2007
+ */
+public class RewriteResults
+{
+   // The URL to the rewritten web.xml
+   public URL webXML;
+   // Maps the servlet name to the target bean
+   public Map<String, String> sepTargetMap = new HashMap<String, String>();
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/RewriteResults.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandler.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandler.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandler.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,42 @@
+/*
+ * 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.container.jboss50.deployment.tomcat;
+
+//$Id$
+
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+
+/**
+ * Handle web app security meta data 
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @since 12-May-2006
+ */
+public interface SecurityHandler
+{
+   /** Add the security domain to jboss-web.xml */
+   void addSecurityDomain(JBossWebMetaData jbossWeb, Deployment dep);
+   
+   /** Add the security roles to web.xml */
+   void addSecurityRoles(JBossWebMetaData webApp, Deployment dep);
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandler.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,68 @@
+/*
+ * 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.container.jboss50.deployment.tomcat;
+
+//$Id$
+
+import org.jboss.metadata.common.ejb.IAssemblyDescriptorMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+
+/**
+ * Handle web app security meta data for EJB21 
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @since 12-May-2006
+ */
+public class SecurityHandlerEJB21 implements SecurityHandler
+{
+   public void addSecurityDomain(JBossWebMetaData jbossWeb, Deployment dep)
+   {
+      EJBArchiveMetaData ejbMetaData = dep.getAttachment(EJBArchiveMetaData.class);
+      if (ejbMetaData == null)
+         throw new IllegalStateException("Cannot obtain application meta data");
+
+      String securityDomain = ejbMetaData.getSecurityDomain();
+      if (securityDomain != null)
+      {
+         if (securityDomain.startsWith("java:/jaas/") == false)
+            securityDomain = "java:/jaas/" + securityDomain;
+
+         jbossWeb.setSecurityDomain(securityDomain);
+      }
+   }
+
+   public void addSecurityRoles(JBossWebMetaData webApp, Deployment dep)
+   {
+      JBossMetaData jbmd = dep.getAttachment(JBossMetaData.class);
+      IAssemblyDescriptorMetaData assemblyDescriptor = jbmd.getAssemblyDescriptor();
+      if (assemblyDescriptor != null)
+      {
+         SecurityRolesMetaData securityRoles = assemblyDescriptor.getSecurityRoles();
+         if (securityRoles != null)
+            webApp.setSecurityRoles(securityRoles);
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB21.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,103 @@
+/*
+ * 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.container.jboss50.deployment.tomcat;
+
+//$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 javax.annotation.security.RolesAllowed;
+import java.util.Iterator;
+
+/**
+ * Handle web app security meta data for EJB3 
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @since 12-May-2006
+ */
+public class SecurityHandlerEJB3 implements SecurityHandler
+{
+   public void addSecurityDomain(JBossWebMetaData jbossWeb, Deployment dep)
+   {
+      String securityDomain = null;
+
+      Ejb3Deployment ejb3Deployment = dep.getAttachment(Ejb3Deployment.class);
+      if (ejb3Deployment != null)
+      {
+         WebServiceDeployment apiAdapter = WebServiceDeploymentApiAdapter.createInstance(ejb3Deployment);
+         Iterator<WebServiceDeclaration> it = apiAdapter.getServiceEndpoints().iterator();
+         while (it.hasNext())
+         {
+            WebServiceDeclaration container = it.next();
+            SecurityDomain anSecurityDomain = container.getAnnotation(SecurityDomain.class);
+            if (anSecurityDomain != null)
+            {
+               if (securityDomain != null && !securityDomain.equals(anSecurityDomain.value()))
+                  throw new IllegalStateException("Multiple security domains not supported");
+
+               securityDomain = anSecurityDomain.value();
+            }
+         }
+      }
+
+      if (securityDomain != null)
+      {
+         if (securityDomain.startsWith("java:/jaas/") == false)
+            securityDomain = "java:/jaas/" + securityDomain;
+
+         jbossWeb.setSecurityDomain(securityDomain);
+      }
+   }
+
+   public void addSecurityRoles(JBossWebMetaData webApp, Deployment dep)
+   {
+      Ejb3Deployment ejb3Deployment = dep.getAttachment(Ejb3Deployment.class);
+      if (ejb3Deployment != null)
+      {
+         WebServiceDeployment apiAdapter = WebServiceDeploymentApiAdapter.createInstance(ejb3Deployment);
+         Iterator<WebServiceDeclaration> it = apiAdapter.getServiceEndpoints().iterator();
+         while (it.hasNext())
+         {
+            WebServiceDeclaration container = it.next();
+            RolesAllowed anRolesAllowed = container.getAnnotation(RolesAllowed.class);
+            if (anRolesAllowed != null)
+            {
+               SecurityRolesMetaData securityRoles = webApp.getSecurityRoles();
+               for (String roleName : anRolesAllowed.value())
+               {
+                  SecurityRoleMetaData role = new SecurityRoleMetaData();
+                  role.setRoleName(roleName);
+                  securityRoles.add(role);
+               }
+            }
+         }
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/SecurityHandlerEJB3.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,35 @@
+/*
+ * 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.container.jboss50.deployment.tomcat;
+
+import org.jboss.wsf.spi.deployment.Deployment;
+
+/**
+ * Modifies the web app according to the stack requirements.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 19-May-2007
+ */
+public interface WebMetaDataModifier
+{            
+   RewriteResults modifyMetaData(Deployment dep) throws ClassNotFoundException;
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifier.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,205 @@
+/*
+ * 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.container.jboss50.deployment.tomcat;
+
+import org.jboss.logging.Logger;
+import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ListenerMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.transport.HttpSpec;
+
+import javax.xml.ws.WebServiceException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The rewriter for web.xml
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 19-May-2007
+ */
+public class WebMetaDataModifierImpl implements WebMetaDataModifier
+{
+   // logging support
+   private static Logger log = Logger.getLogger(WebMetaDataModifierImpl.class);
+
+   public RewriteResults modifyMetaData(Deployment dep)
+   {
+      JBossWebMetaData jbwmd = dep.getAttachment(JBossWebMetaData.class);
+      if (jbwmd == null)
+         throw new WebServiceException("Cannot find web meta data");
+
+      try
+      {
+         RewriteResults results = modifyMetaData(dep, jbwmd);
+         return results;
+      }
+      catch (RuntimeException rte)
+      {
+         throw rte;
+      }
+      catch (Exception e)
+      {
+         throw new WebServiceException(e);
+      }
+   }
+
+   private RewriteResults modifyMetaData(Deployment dep, JBossWebMetaData jbwmd) throws ClassNotFoundException
+   {
+      RewriteResults results = new RewriteResults();
+
+      String servletClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS);
+      if (servletClass == null)
+         throw new IllegalStateException("Cannot obtain context property: " + HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS);
+
+      Map<String, String> depCtxParams = (Map<String, String>)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_CONTEXT_PARAMETERS);
+      if (depCtxParams != null)
+      {
+         List<ParamValueMetaData> contextParams = jbwmd.getContextParams();
+         if (contextParams == null)
+         {
+            contextParams = new ArrayList<ParamValueMetaData>();
+            jbwmd.setContextParams(contextParams);
+         }
+
+         for (Map.Entry<String, String> entry : depCtxParams.entrySet())
+         {
+            ParamValueMetaData param = new ParamValueMetaData();
+            param.setParamName(entry.getKey());
+            param.setParamValue(entry.getValue());
+            contextParams.add(param);
+         }
+      }
+
+      String listenerClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER);
+      if (listenerClass != null)
+      {
+         List<ListenerMetaData> listeners = jbwmd.getListeners();
+         if (listeners == null)
+         {
+            listeners = new ArrayList<ListenerMetaData>();
+            jbwmd.setListeners(listeners);
+         }
+         ListenerMetaData listener = new ListenerMetaData();
+         listener.setListenerClass(listenerClass);
+      }
+
+      for (Iterator it = jbwmd.getServlets().iterator(); it.hasNext();)
+      {
+         JBossServletMetaData servlet = (JBossServletMetaData)it.next();
+         List<ParamValueMetaData> initParams = servlet.getInitParam();
+         if (initParams == null)
+         {
+            initParams = new ArrayList<ParamValueMetaData>();
+            servlet.setInitParam(initParams);
+         }
+
+         String linkName = servlet.getServletName();
+
+         // find the servlet-class
+         String orgServletClassName = servlet.getServletClass();
+
+         // JSP
+         if (orgServletClassName == null)
+            continue;
+
+         // Get the servlet class
+         Class orgServletClass = null;
+         try
+         {
+            ClassLoader loader = dep.getInitialClassLoader();
+            orgServletClass = loader.loadClass(orgServletClassName);
+         }
+         catch (ClassNotFoundException ex)
+         {
+            log.warn("Cannot load servlet class: " + orgServletClassName);
+         }
+
+         String targetBeanName = null;
+
+         // Nothing to do if we have an <init-param>
+         if (isAlreadyModified(servlet))
+         {
+            for (ParamValueMetaData initParam : initParams)
+            {
+               String paramName = initParam.getParamName();
+               String paramValue = initParam.getParamValue();
+               if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(paramName))
+               {
+                  targetBeanName = paramValue;
+               }
+            }
+         }
+         else
+         {
+            // Check if it is a real servlet that we can ignore
+            if (orgServletClass != null && javax.servlet.Servlet.class.isAssignableFrom(orgServletClass))
+            {
+               log.info("Ignore servlet: " + orgServletClassName);
+               continue;
+            }
+            else if (orgServletClassName.endsWith("Servlet"))
+            {
+               log.info("Ignore <servlet-class> that ends with 'Servlet': " + orgServletClassName);
+               continue;
+            }
+
+            servlet.setServletClass(servletClass);
+
+            // add additional init params
+            if (orgServletClassName.equals(servletClass) == false)
+            {
+               targetBeanName = orgServletClassName;
+               ParamValueMetaData initParam = new ParamValueMetaData();
+               initParam.setParamName(Endpoint.SEPID_DOMAIN_ENDPOINT);
+               initParam.setParamValue(targetBeanName);
+               initParams.add(initParam);
+            }
+         }
+
+         if (targetBeanName == null)
+            throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName);
+
+         // remember the target bean name
+         results.sepTargetMap.put(linkName, targetBeanName);
+      }
+
+      return results;
+   }
+
+   // Return true if the web.xml is already modified
+   private boolean isAlreadyModified(JBossServletMetaData servlet)
+   {
+      for (ParamValueMetaData initParam : servlet.getInitParam())
+      {
+         String paramName = initParam.getParamName();
+         if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(paramName))
+            return true;
+      }
+      return false;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/ServiceEndpointContainerApiAdapter.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,110 @@
+/*
+ * 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 at 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);
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/ServiceEndpointContainerApiAdapter.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/WebServiceDeploymentApiAdapter.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,94 @@
+/*
+ * 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 at 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


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/ejb3/WebServiceDeploymentApiAdapter.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,55 @@
+/*
+ * 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.container.jboss50.invocation;
+
+// $Id$
+
+import java.lang.reflect.Method;
+
+import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+
+/**
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public abstract class AbstractInvocationHandler extends InvocationHandler
+{
+   protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+   {
+      String methodName = seiMethod.getName();
+      Class[] paramTypes = seiMethod.getParameterTypes();
+      for (int i = 0; i < paramTypes.length; i++)
+      {
+         Class paramType = paramTypes[i];
+         if (JavaUtils.isPrimitive(paramType) == false)
+         {
+            String paramTypeName = paramType.getName();
+            paramType = JavaUtils.loadJavaType(paramTypeName);
+            paramTypes[i] = paramType;
+         }
+      }
+
+      Method implMethod = implClass.getMethod(methodName, paramTypes);
+      return implMethod;
+   }
+}
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/AbstractInvocationHandler.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,199 @@
+/*
+ * 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.container.jboss50.invocation;
+
+// $Id$
+
+import java.lang.reflect.Method;
+import java.security.Principal;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.ejb.EjbModule;
+import org.jboss.ejb.Interceptor;
+import org.jboss.ejb.StatelessSessionContainer;
+import org.jboss.invocation.InvocationKey;
+import org.jboss.invocation.InvocationType;
+import org.jboss.invocation.PayloadKey;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
+import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.HandlerCallback;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.container.jboss50.invocation.ServiceEndpointInterceptor;
+
+/**
+ * Handles invocations on EJB21 endpoints.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerEJB21 extends InvocationHandler
+{
+   // provide logging
+   private static final Logger log = Logger.getLogger(InvocationHandlerEJB21.class);
+
+   private String jndiName;
+   private MBeanServer server;
+   private ObjectName objectName;
+
+   InvocationHandlerEJB21()
+   {
+   }
+
+   public Invocation createInvocation()
+   {
+      return new Invocation();
+   }
+
+   public void init(Endpoint ep)
+   {
+      String ejbName = ep.getShortName();
+      Deployment dep = ep.getService().getDeployment();
+      EJBArchiveMetaData apMetaData = dep.getAttachment(EJBArchiveMetaData.class);
+      EJBMetaData beanMetaData = (EJBMetaData)apMetaData.getBeanByEjbName(ejbName);
+      if (beanMetaData == null)
+         throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName);
+
+      // get the MBeanServer
+      server = MBeanServerLocator.locateJBoss();
+
+      // get the bean's JNDI name
+      jndiName = beanMetaData.getContainerObjectNameJndiName();
+      if (jndiName == null)
+         throw new WebServiceException("Cannot obtain JNDI name for: " + ejbName);
+   }
+
+   public void invoke(Endpoint ep, Invocation inv) throws Exception
+   {
+      log.debug("Invoke: " + inv.getJavaMethod().getName());
+
+      if (objectName == null)
+      {
+         objectName = ObjectNameFactory.create("jboss.j2ee:jndiName=" + jndiName + ",service=EJB");
+         if (server.isRegistered(objectName) == false)
+            throw new WebServiceException("Cannot find service endpoint target: " + objectName);
+
+         // Inject the Service endpoint interceptor
+         injectServiceEndpointInterceptor(objectName, ep.getShortName());
+      }
+
+      // invoke on the container
+      try
+      {
+         // setup the invocation
+         org.jboss.invocation.Invocation jbInv = getMBeanInvocation(inv);
+
+         String[] sig = { org.jboss.invocation.Invocation.class.getName() };
+         Object retObj = server.invoke(objectName, "invoke", new Object[] { jbInv }, sig);
+         inv.setReturnValue(retObj);
+      }
+      catch (Exception e)
+      {
+         handleInvocationException(e);
+      }
+   }
+
+   private org.jboss.invocation.Invocation getMBeanInvocation(Invocation inv)
+   {
+      // EJB2.1 endpoints will only get an JAXRPC context 
+      MessageContext msgContext = inv.getInvocationContext().getAttachment(MessageContext.class);
+      if (msgContext == null)
+         throw new IllegalStateException("Cannot obtain MessageContext");
+
+      SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+      SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter();
+      SecurityContext sc = SecurityContextAssociation.getSecurityContext();
+      Principal principal = securityAdaptor.getPrincipal();
+      Object credential = securityAdaptor.getCredential();
+
+      if (principal == null && sc != null)
+         principal = sc.getUtil().getUserPrincipal();
+
+      if (credential == null && sc != null)
+         credential = sc.getUtil().getCredential();
+
+      Method method = inv.getJavaMethod();
+      Object[] args = inv.getArgs();
+      org.jboss.invocation.Invocation jbInv = new org.jboss.invocation.Invocation(null, method, args, null, principal, credential);
+
+      HandlerCallback callback = inv.getInvocationContext().getAttachment(HandlerCallback.class);
+      if (callback == null)
+         throw new IllegalStateException("Cannot obtain HandlerCallback");
+
+      jbInv.setValue(InvocationKey.SOAP_MESSAGE_CONTEXT, msgContext);
+      jbInv.setValue(InvocationKey.SOAP_MESSAGE, ((SOAPMessageContext)msgContext).getMessage());
+      jbInv.setType(InvocationType.SERVICE_ENDPOINT);
+      jbInv.setValue(HandlerCallback.class.getName(), callback, PayloadKey.TRANSIENT);
+      jbInv.setValue(Invocation.class.getName(), inv, PayloadKey.TRANSIENT);
+
+      return jbInv;
+   }
+
+   private void injectServiceEndpointInterceptor(ObjectName objectName, String ejbName)
+   {
+      // Dynamically add the service endpoint interceptor
+      // http://jira.jboss.org/jira/browse/JBWS-758
+      try
+      {
+         EjbModule ejbModule = (EjbModule)server.getAttribute(objectName, "EjbModule");
+         StatelessSessionContainer container = (StatelessSessionContainer)ejbModule.getContainer(ejbName);
+
+         boolean injectionPointFound = false;
+         Interceptor prev = container.getInterceptor();
+         while (prev != null && prev.getNext() != null)
+         {
+            Interceptor next = prev.getNext();
+            if (next.getNext() == null)
+            {
+               log.debug("Inject service endpoint interceptor after: " + prev.getClass().getName());
+               ServiceEndpointInterceptor sepInterceptor = new ServiceEndpointInterceptor();
+               prev.setNext(sepInterceptor);
+               sepInterceptor.setNext(next);
+               injectionPointFound = true;
+            }
+            prev = next;
+         }
+         if (injectionPointFound == false)
+            log.warn("Cannot service endpoint interceptor injection point");
+      }
+      catch (Exception ex)
+      {
+         log.warn("Cannot add service endpoint interceptor", ex);
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB21.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: 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	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,114 @@
+/*
+ * 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.container.jboss50.invocation;
+
+// $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.util.KernelLocator;
+
+import javax.management.ObjectName;
+import javax.xml.ws.WebServiceException;
+import java.lang.reflect.Method;
+
+/**
+ * Handles invocations on EJB3 endpoints.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerEJB3 extends AbstractInvocationHandler
+{
+   private ObjectName objectName;
+   private KernelController houston;
+
+   InvocationHandlerEJB3()
+   {
+      houston = KernelLocator.getKernel().getController();
+   }
+
+   public Invocation createInvocation()
+   {
+      return new Invocation();
+   }
+
+   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);
+   }
+
+   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();
+         Method method = getImplMethod(beanClass, wsInv.getJavaMethod());
+         Object[] args = wsInv.getArgs();
+         InvocationContextCallback invProps = new EJB3InvocationContextCallback(wsInv);
+
+         Object retObj = apiAdapter.invokeEndpoint(method, args, invProps);
+
+         wsInv.setReturnValue(retObj);
+      }
+      catch (Throwable th)
+      {
+         handleInvocationException(th);
+      }
+   }
+
+   static class EJB3InvocationContextCallback implements InvocationContextCallback
+   {
+      private Invocation wsInv;
+
+      public EJB3InvocationContextCallback(Invocation wsInv)
+      {
+         this.wsInv = wsInv;
+      }
+
+      public <T> T get(Class<T> propertyType)
+      {
+         return wsInv.getInvocationContext().getAttachment(propertyType);               
+      }
+   }
+}
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerEJB3.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,66 @@
+/*
+ * 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.container.jboss50.invocation;
+
+import org.jboss.wsf.spi.invocation.*;
+import org.jboss.wsf.container.jboss50.invocation.*;
+
+/**
+ * The default invocation model factory fro AS 5.0.
+ *
+ * @author Heiko.Braun at jboss.com
+ *         Created: Jul 19, 2007
+ */
+public class InvocationHandlerFactoryImpl extends InvocationHandlerFactory
+{
+   public InvocationHandler newInvocationHandler(InvocationType type)
+   {
+      InvocationHandler handler = null;
+
+      switch(type)
+      {
+         case JAXRPC_JSE:
+            handler = new InvocationHandlerJAXRPC();
+            break;
+         case JAXRPC_EJB21:
+            handler = new InvocationHandlerEJB21();
+            break;
+         case JAXRPC_MDB21:
+            handler = new InvocationHandlerMDB21();
+            break;
+         case JAXWS_JSE:
+            handler = new InvocationHandlerJAXWS();
+            break;
+         case JAXWS_EJB3:
+            handler = new InvocationHandlerEJB3();
+            break;
+         case JAXWS_MDB3:
+            handler = new InvocationHandlerMDB3();
+            break;
+      }
+
+      if(null == handler)
+         throw new IllegalArgumentException("Unable to resolve spi.invocation.InvocationHandler for type " +type);
+
+      return handler;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,72 @@
+/*
+ * 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.container.jboss50.invocation;
+
+// $Id$
+
+import javax.xml.rpc.server.ServiceLifecycle;
+import javax.xml.rpc.server.ServletEndpointContext;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerJAXRPC extends InvocationHandlerJSE
+{
+   public void invoke(Endpoint ep, Invocation epInv) throws Exception
+   {
+      try
+      {
+         Object targetBean = getTargetBean(ep, epInv);
+
+         InvocationContext invContext = epInv.getInvocationContext();
+         if (targetBean instanceof ServiceLifecycle)
+         {
+            ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class);
+            if (sepContext != null)
+               ((ServiceLifecycle)targetBean).init(sepContext);
+         }
+
+         try
+         {
+            super.invoke(ep, epInv);
+         }
+         finally
+         {
+            if (targetBean instanceof ServiceLifecycle)
+            {
+               ((ServiceLifecycle)targetBean).destroy();
+            }
+         }
+      }
+      catch (Exception e)
+      {
+         handleInvocationException(e);
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXRPC.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,34 @@
+/*
+ * 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.container.jboss50.invocation;
+
+// $Id$
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerJAXWS extends InvocationHandlerJSE
+{
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJAXWS.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,128 @@
+/*
+ * 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.container.jboss50.invocation;
+
+// $Id$
+
+import java.lang.reflect.Method;
+
+import javax.xml.ws.WebServiceContext;
+
+import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.ResourceInjector;
+import org.jboss.wsf.spi.invocation.ResourceInjectorFactory;
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerJSE extends InvocationHandler
+{
+   private SPIProvider spiProvider;
+   private ResourceInjectorFactory resourceInjectorFactory;
+
+   public InvocationHandlerJSE()
+   {
+      spiProvider = SPIProviderResolver.getInstance().getProvider();
+      resourceInjectorFactory = spiProvider.getSPI(ResourceInjectorFactory.class);
+   }
+
+   public Invocation createInvocation()
+   {
+      return new Invocation();
+   }
+
+   public void init(Endpoint ep)
+   {
+   }
+
+   protected Object getTargetBean(Endpoint ep, Invocation epInv)
+   {
+      InvocationContext invCtx = epInv.getInvocationContext();
+      Object targetBean = invCtx.getTargetBean();
+      if (targetBean == null)
+      {
+         try
+         {
+            Class epImpl = ep.getTargetBeanClass();
+            targetBean = epImpl.newInstance();
+            invCtx.setTargetBean(targetBean);
+         }
+         catch (Exception ex)
+         {
+            throw new IllegalStateException("Cannot get target bean instance", ex);
+         }
+      }
+      return targetBean;
+   }
+
+   public void invoke(Endpoint ep, Invocation epInv) throws Exception
+   {
+      try
+      {
+         Object targetBean = getTargetBean(ep, epInv);
+
+         InvocationContext invContext = epInv.getInvocationContext();
+         WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
+         if (wsContext != null)
+         {
+            ResourceInjector injector = resourceInjectorFactory.newResourceInjector();
+            injector.inject(targetBean, wsContext);
+         }
+
+         Method method = getImplMethod(targetBean.getClass(), epInv.getJavaMethod());
+         Object retObj = method.invoke(targetBean, epInv.getArgs());
+         epInv.setReturnValue(retObj);
+      }
+      catch (Exception e)
+      {
+         handleInvocationException(e);
+      }
+   }
+
+   protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+   {
+      String methodName = seiMethod.getName();
+      Class[] paramTypes = seiMethod.getParameterTypes();
+      for (int i = 0; i < paramTypes.length; i++)
+      {
+         Class paramType = paramTypes[i];
+         if (JavaUtils.isPrimitive(paramType) == false)
+         {
+            String paramTypeName = paramType.getName();
+            paramType = JavaUtils.loadJavaType(paramTypeName);
+            paramTypes[i] = paramType;
+         }
+      }
+
+      Method implMethod = implClass.getMethod(methodName, paramTypes);
+      return implMethod;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,88 @@
+/*
+ * 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.container.jboss50.invocation;
+
+// $Id$
+
+import java.lang.reflect.Method;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+
+/**
+ * Handles invocations on MDB EJB21 endpoints.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerMDB21 extends AbstractInvocationHandler
+{
+   // provide logging
+   private static final Logger log = Logger.getLogger(InvocationHandlerMDB21.class);
+
+   public Invocation createInvocation()
+   {
+      return new Invocation();
+   }
+
+   public void init(Endpoint ep)
+   {
+
+   }
+
+   public void invoke(Endpoint ep, Invocation epInv) throws Exception
+   {
+      log.debug("Invoke: " + epInv.getJavaMethod().getName());
+
+      try
+      {
+         InvocationContext invCtx = epInv.getInvocationContext();
+         Object targetBean = invCtx.getTargetBean();
+         if (targetBean == null)
+         {
+            try
+            {
+               Class epImpl = ep.getTargetBeanClass();
+               targetBean = epImpl.newInstance();
+               invCtx.setTargetBean(targetBean);
+            }
+            catch (Exception ex)
+            {
+               throw new IllegalStateException("Canot get target bean instance", ex);
+            }
+         }
+         Class implClass = targetBean.getClass();
+         Method seiMethod = epInv.getJavaMethod();
+         Method implMethod = getImplMethod(implClass, seiMethod);
+
+         Object[] args = epInv.getArgs();
+         Object retObj = implMethod.invoke(targetBean, args);
+         epInv.setReturnValue(retObj);
+      }
+      catch (Exception e)
+      {
+         handleInvocationException(e);
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB21.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,88 @@
+/*
+ * 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.container.jboss50.invocation;
+
+// $Id$
+
+import java.lang.reflect.Method;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+
+/**
+ * Handles invocations on MDB EJB3 endpoints.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerMDB3 extends AbstractInvocationHandler
+{
+   // provide logging
+   private static final Logger log = Logger.getLogger(InvocationHandlerMDB3.class);
+
+   public Invocation createInvocation()
+   {
+      return new Invocation();
+   }
+
+   public void init(Endpoint ep)
+   {
+
+   }
+
+   public void invoke(Endpoint ep, Invocation epInv) throws Exception
+   {
+      log.debug("Invoke: " + epInv.getJavaMethod().getName());
+
+      try
+      {
+         InvocationContext invCtx = epInv.getInvocationContext();
+         Object targetBean = invCtx.getTargetBean();
+         if (targetBean == null)
+         {
+            try
+            {
+               Class epImpl = ep.getTargetBeanClass();
+               targetBean = epImpl.newInstance();
+               invCtx.setTargetBean(targetBean);
+            }
+            catch (Exception ex)
+            {
+               throw new IllegalStateException("Canot get target bean instance", ex);
+            }
+         }
+         Class implClass = targetBean.getClass();
+         Method seiMethod = epInv.getJavaMethod();
+         Method implMethod = getImplMethod(implClass, seiMethod);
+
+         Object[] args = epInv.getArgs();
+         Object retObj = implMethod.invoke(targetBean, args);
+         epInv.setReturnValue(retObj);
+      }
+      catch (Exception e)
+      {
+         handleInvocationException(e);
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerMDB3.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,37 @@
+/*
+ * 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.container.jboss50.invocation;
+
+import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+
+/**
+ * @author Heiko.Braun at jboss.com
+ *         Created: Jul 24, 2007
+ */
+public class SecurityAdapterFactoryImpl extends SecurityAdaptorFactory
+{
+   public SecurityAdaptor newSecurityAdapter()
+   {
+      return new SecurityAdaptorImpl();
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdapterFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,62 @@
+/*
+ * 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.container.jboss50.invocation;
+
+// $Id$
+
+import org.jboss.security.SecurityAssociation;
+import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+
+import java.security.Principal;
+
+/**
+ * A JBoss specific SecurityAssociationAdaptor 
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2006
+ */
+public class SecurityAdaptorImpl implements SecurityAdaptor
+{
+   SecurityAdaptorImpl()
+   {
+   }
+
+   public Principal getPrincipal()
+   {
+      return SecurityAssociation.getPrincipal();
+   }
+   
+   public void setPrincipal(Principal pricipal)
+   {
+      SecurityAssociation.setPrincipal(pricipal);
+   }
+
+   public Object getCredential()
+   {
+      return SecurityAssociation.getCredential();
+   }
+
+   public void setCredential(Object credential)
+   {
+      SecurityAssociation.setCredential(credential);
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,126 @@
+/*
+ * 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.container.jboss50.invocation;
+
+// $Id$
+
+import org.jboss.ejb.plugins.AbstractInterceptor;
+import org.jboss.invocation.InvocationKey;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.invocation.HandlerCallback;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
+
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+
+/**
+ * This Interceptor does the ws4ee handler processing.
+ * 
+ * According to the ws4ee spec the handler logic must be invoked after the container
+ * applied method level security to the invocation. 
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 21-Sep-2005
+ */
+public class ServiceEndpointInterceptor extends AbstractInterceptor
+{
+   // provide logging
+   private static Logger log = Logger.getLogger(ServiceEndpointInterceptor.class);
+
+   // Interceptor implementation --------------------------------------
+
+   /** Before and after we call the service endpoint bean, we process the handler chains.
+    */
+   public Object invoke(final org.jboss.invocation.Invocation jbInv) throws Exception
+   {
+      // If no msgContext, it's not for us
+      SOAPMessageContext msgContext = (SOAPMessageContext)jbInv.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT);
+      if (msgContext == null)
+      {
+         return getNext().invoke(jbInv);
+      }
+
+      // Get the endpoint invocation 
+      Invocation wsInv = (Invocation)jbInv.getValue(Invocation.class.getName());
+
+      // Get the handler callback 
+      HandlerCallback callback = (HandlerCallback)jbInv.getValue(HandlerCallback.class.getName());
+
+      // Handlers need to be Tx. Therefore we must invoke the handler chain after the TransactionInterceptor.
+      if (callback != null && wsInv != null)
+      {
+         try
+         {
+            // call the request handlers
+            boolean handlersPass = callback.callRequestHandlerChain(wsInv, HandlerType.ENDPOINT);
+            handlersPass = handlersPass && callback.callRequestHandlerChain(wsInv, HandlerType.POST);
+
+            // Call the next interceptor in the chain
+            if (handlersPass)
+            {
+               // The SOAPContentElements stored in the EndpointInvocation might have changed after
+               // handler processing. Get the updated request payload. This should be a noop if request
+               // handlers did not modify the incomming SOAP message.
+               Object[] reqParams = wsInv.getArgs();
+               jbInv.setArguments(reqParams);
+               Object resObj = getNext().invoke(jbInv);
+
+               // Setting the message to null should trigger binding of the response message
+               msgContext.setMessage(null);
+               wsInv.setReturnValue(resObj);
+            }
+
+            // call the response handlers
+            handlersPass = callback.callResponseHandlerChain(wsInv, HandlerType.POST);
+            handlersPass = handlersPass && callback.callResponseHandlerChain(wsInv, HandlerType.ENDPOINT);
+
+            // update the return value after response handler processing
+            Object resObj = wsInv.getReturnValue();
+
+            return resObj;
+         }
+         catch (Exception ex)
+         {
+            try
+            {
+               // call the fault handlers
+               boolean handlersPass = callback.callFaultHandlerChain(wsInv, HandlerType.POST, ex);
+               handlersPass = handlersPass && callback.callFaultHandlerChain(wsInv, HandlerType.ENDPOINT, ex);
+            }
+            catch (Exception subEx)
+            {
+               log.warn("Cannot process handlerChain.handleFault, ignoring: ", subEx);
+            }
+            throw ex;
+         }
+         finally
+         {
+            // do nothing
+         }
+      }
+      else
+      {
+         log.warn("Handler callback not available");
+         return getNext().invoke(jbInv);
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/ServiceEndpointInterceptor.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,45 @@
+/*
+ * 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.container.jboss50.invocation;
+
+import org.jboss.wsf.spi.invocation.*;
+
+import javax.xml.ws.handler.MessageContext;
+
+/**
+ * @author Heiko.Braun at jboss.com
+ *         Created: Jul 25, 2007
+ */
+public class WebServiceContextFactoryImpl extends WebServiceContextFactory
+{
+   public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext)
+   {
+      ExtensibleWebServiceContext context = null;
+
+      if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1)
+         context = new WebServiceContextEJB(messageContext);
+      else
+         context = new WebServiceContextJSE(messageContext);
+
+      return context;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,60 @@
+/*
+ * 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.transport;
+
+import org.jboss.wsf.spi.transport.TransportManagerFactory;
+import org.jboss.wsf.spi.transport.TransportManager;
+import org.jboss.wsf.spi.transport.Protocol;
+
+/**
+ * Used with MC
+ * 
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class BareTransportManagerFactory implements TransportManagerFactory
+{
+
+   private TransportManager httpTransport;
+
+
+   public void setHttpTransport(TransportManager httpTransport)
+   {
+      this.httpTransport = httpTransport;
+   }
+
+   public TransportManager createTransportManager(Protocol protocol)
+   {
+      TransportManager manager = null;
+
+      switch(protocol)
+      {
+         case HTTP:
+            manager = httpTransport;
+            break;
+         default:
+            throw new IllegalArgumentException("No TransportManager for protocol: " + protocol);
+      }
+
+      return manager;
+   }
+}
+


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/BareTransportManagerFactory.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,110 @@
+/*
+ * 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.transport;
+
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.framework.transport.HttpListenerRef;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.transport.HttpSpec;
+import org.jboss.wsf.spi.transport.ListenerRef;
+import org.jboss.wsf.spi.transport.TransportManager;
+import org.jboss.wsf.spi.transport.TransportSpec;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * Creates a webapp dpeloyment and pushes it into the deployment framework
+ * 
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class EJBHttpTransportManager implements TransportManager
+{
+   private WebAppDeploymentFactory deploymentFactory;
+   private WebAppGenerator generator;
+
+   public ListenerRef createListener(Endpoint endpoint, TransportSpec transportSpec)
+   {
+
+      assert deploymentFactory!=null;
+      assert generator!=null;
+
+      // Resolve the endpoint address
+      if(! (transportSpec instanceof HttpSpec))
+         throw new IllegalArgumentException("Unknown TransportSpec " + transportSpec);
+      HttpSpec httpSpec = (HttpSpec)transportSpec;
+
+      // Create JBossWebMetaData and attach it to the DeploymentUnit
+      Deployment topLevelDeployment = endpoint.getService().getDeployment();
+
+      // TODO: Somehow the ServletClass and InitParameter need to go from TransportSpec into generator
+      topLevelDeployment.setProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CLASS, httpSpec.getServletClass());
+      topLevelDeployment.setProperty(HttpSpec.PROPERTY_WEBAPP_CONTEXT_PARAMETERS, httpSpec.getContextParameter());      
+      JBossWebMetaData jbwMetaData = generator.create(topLevelDeployment);
+      deploymentFactory.create(topLevelDeployment, jbwMetaData);
+
+      SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+      ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class);
+      ServerConfig serverConfig = spi.getServerConfig();
+
+      String host = serverConfig.getWebServiceHost();
+      int port = serverConfig.getWebServicePort();
+      String hostAndPort = host + (port > 0 ? ":" + port : "");
+
+      try
+      {
+         String ctx = httpSpec.getWebContext();
+         String pattern = httpSpec.getUrlPattern();
+         ListenerRef ref =  new HttpListenerRef(
+           ctx, pattern,
+           new URI("http://"+hostAndPort+ctx+pattern)
+         );
+
+         return ref;
+
+      } catch (URISyntaxException e)
+      {
+         throw new RuntimeException("Failed to create ListenerRef", e);
+      }
+      
+   }
+
+   public void destroyListener(ListenerRef ref)
+   {
+      // noop
+   }
+
+   public void setDeploymentFactory(WebAppDeploymentFactory deploymentFactory)
+   {
+      this.deploymentFactory = deploymentFactory;
+   }
+
+   public void setGenerator(WebAppGenerator generator)
+   {
+      this.generator = generator;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EJBHttpTransportManager.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,191 @@
+/*
+ * 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.transport;
+
+import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.DeploymentFactory;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.structure.spi.ClassLoaderFactory;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifier;
+import org.jboss.wsf.framework.transport.HttpListenerRef;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.transport.HttpSpec;
+import org.jboss.wsf.spi.transport.ListenerRef;
+import org.jboss.wsf.spi.transport.TransportManager;
+import org.jboss.wsf.spi.transport.TransportSpec;
+
+import javax.xml.ws.WebServiceException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class EndpointAPIHttpTransportManager implements TransportManager
+{
+   private static Logger log = Logger.getLogger(EndpointAPIHttpTransportManager.class);
+
+   private WebAppGenerator generator;
+   private DeploymentFactory factory = new DeploymentFactory();
+
+   private WebMetaDataModifier webMetaDataModifier;
+   private DeployerClient mainDeployer;
+
+   private Map<String, Deployment> deploymentRegistry = new HashMap<String, Deployment>();
+   
+   public ListenerRef createListener(Endpoint endpoint, TransportSpec transportSpec)
+   {
+      assert generator!=null;
+      assert webMetaDataModifier!=null;     
+
+      // Resolve the endpoint address
+      if(! (transportSpec instanceof HttpSpec))
+         throw new IllegalArgumentException("Unknown TransportSpec " + transportSpec);
+      HttpSpec httpSpec = (HttpSpec)transportSpec;
+
+      // Create JBossWebMetaData and attach it to the DeploymentUnit
+      Deployment topLevelDeployment = endpoint.getService().getDeployment();
+      JBossWebMetaData jbwMetaData = generator.create(topLevelDeployment);
+
+      // Server config
+      SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+      ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class);
+      ServerConfig serverConfig = spi.getServerConfig();
+      String host = serverConfig.getWebServiceHost();
+      int port = serverConfig.getWebServicePort();
+      String hostAndPort = host + (port > 0 ? ":" + port : "");
+
+      ListenerRef listenerRef = null;
+      try
+      {
+         String ctx = httpSpec.getWebContext();
+         String pattern = httpSpec.getUrlPattern();
+         listenerRef =  new HttpListenerRef( ctx, pattern, new URI("http://"+hostAndPort+ctx+pattern) );
+
+      } catch (URISyntaxException e)
+      {
+         throw new RuntimeException("Failed to create ListenerRef", e);
+      }
+
+      // Pass on to the main deployer
+      deploy(topLevelDeployment);
+
+      // Map listenerRef for destroy phase
+      deploymentRegistry.put( listenerRef.getUUID(), topLevelDeployment );
+
+      return listenerRef;
+
+   }
+
+   public void destroyListener(ListenerRef ref)
+   {
+      Deployment dep = deploymentRegistry.get(ref.getUUID());
+      if(null==dep)
+         throw new IllegalArgumentException("Unknown ListenerRef " + ref);
+
+      undeploy(dep);
+      deploymentRegistry.remove(ref.getUUID());
+   }
+
+   public void setGenerator(WebAppGenerator generator)
+   {
+      this.generator = generator;
+   }
+   
+   public void setWebMetaDataModifier(WebMetaDataModifier webMetaDataModifier)
+   {
+      this.webMetaDataModifier = webMetaDataModifier;
+   }
+
+   public void setMainDeployer(DeployerClient mainDeployer)
+   {
+      this.mainDeployer = mainDeployer;
+   }
+
+   private void deploy(Deployment dep)
+   {
+      JBossWebMetaData jbwmd = dep.getAttachment(JBossWebMetaData.class);
+      if (jbwmd == null)
+         throw new WebServiceException("Cannot find web meta data");
+
+      try
+      {
+         webMetaDataModifier.modifyMetaData(dep);
+
+         AbstractDeployment deployment = createSimpleDeployment(dep.getSimpleName());
+         MutableAttachments mutableAttachments = (MutableAttachments)deployment.getPredeterminedManagedObjects();
+         mutableAttachments.addAttachment(HttpSpec.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
+         mutableAttachments.addAttachment(ClassLoaderFactory.class, new ContextClassLoaderFactory());
+         mutableAttachments.addAttachment(JBossWebMetaData.class, jbwmd);
+         mainDeployer.deploy(deployment);
+      }
+      catch (Exception ex)
+      {
+         WSFDeploymentException.rethrow(ex);
+      }
+   }
+
+   private void undeploy(Deployment dep)
+   {
+      try
+      {
+         AbstractDeployment deployment = createSimpleDeployment(dep.getSimpleName());
+         mainDeployer.undeploy(deployment);
+      }
+      catch (Exception ex)
+      {
+         WSFDeploymentException.rethrow(ex);
+      }
+   }
+
+   private AbstractDeployment createSimpleDeployment(String name)
+   {
+      AbstractDeployment unit = new AbstractDeployment(name);
+      // There is one top level deployment
+      factory.addContext(unit, "");
+      return unit;
+   }
+
+   private static class ContextClassLoaderFactory implements ClassLoaderFactory
+   {
+      public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception
+      {
+         return Thread.currentThread().getContextClassLoader();
+      }
+
+      public void removeClassLoader(DeploymentUnit unit) throws Exception
+      {
+      }
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/EndpointAPIHttpTransportManager.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,83 @@
+/*
+ * 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.transport;
+
+import org.jboss.wsf.framework.transport.HttpListenerRef;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.transport.HttpSpec;
+import org.jboss.wsf.spi.transport.ListenerRef;
+import org.jboss.wsf.spi.transport.TransportManager;
+import org.jboss.wsf.spi.transport.TransportSpec;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * TransportManager implementation that doesn't create physical
+ * endpoints (ports, etc) but simply constructs a service endpoint address for a given
+ * deployment;
+ *  
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class NoopHttpTransportManager implements TransportManager
+{
+   public ListenerRef createListener(Endpoint endpoint, TransportSpec transportSpec)
+   {
+      if(! (transportSpec instanceof HttpSpec))
+         throw new IllegalArgumentException("Unknown TransportSpec " + transportSpec);
+
+      HttpSpec httpSpec = (HttpSpec)transportSpec;
+
+      SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+      ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class);
+      ServerConfig serverConfig = spi.getServerConfig();
+
+      String host = serverConfig.getWebServiceHost();
+      int port = serverConfig.getWebServicePort();
+      String hostAndPort = host + (port > 0 ? ":" + port : "");
+      
+      try
+      {
+         String ctx = httpSpec.getWebContext();
+         String pattern = httpSpec.getUrlPattern();
+         ListenerRef ref =  new HttpListenerRef(
+           ctx, pattern,
+           new URI("http://"+hostAndPort+ctx+pattern)
+         );
+
+         return ref;
+
+      } catch (URISyntaxException e)
+      {
+         throw new RuntimeException("Failed to create ListenerRef", e);
+      }
+   }
+
+   public void destroyListener(ListenerRef ref)
+   {
+      // noop  
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/NoopHttpTransportManager.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,130 @@
+/*
+ * 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.container.jboss50.transport;
+
+//$Id$
+
+import org.jboss.wsf.common.ResourceLoaderAdapter;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.WSFRuntime;
+import org.jboss.wsf.spi.WSFRuntimeLocator;
+import org.jboss.wsf.spi.deployment.*;
+import org.jboss.wsf.spi.http.HttpContext;
+import org.jboss.wsf.spi.http.HttpContextFactory;
+import org.jboss.wsf.spi.http.HttpServer;
+
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.WebServiceException;
+
+/**
+ * A HTTP Server that uses DeploymentAspects
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 07-Jul-2006
+ */
+public class WSFRuntimeDelegateHttpServer extends AbstractExtensible implements HttpServer
+{
+   /** Start an instance of this HTTP server */
+   public void start()
+   {
+      // verify required properties
+   }
+
+   /** Create an HTTP context */
+   public HttpContext createContext(String contextRoot)
+   {
+      SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+      HttpContext httpContext = spiProvider.getSPI(HttpContextFactory.class).newHttpContext(this, contextRoot);
+      return httpContext;
+   }
+
+   /** Publish an JAXWS endpoint to the HTTP server */
+   public void publish(HttpContext context, Endpoint endpoint)
+   {
+      Class implClass = getImplementorClass(endpoint);
+
+      try
+      {
+         // Get the deployment model factory
+         SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+         WSFRuntimeLocator locator = spiProvider.getSPI(WSFRuntimeLocator.class);
+         WSFRuntime runtime = locator.locateRuntime("EndpointAPIRuntime");
+
+         DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
+
+         // Create/Setup the deployment
+         Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader());
+         dep.setType(Deployment.DeploymentType.JAXWS_JSE);
+         dep.setRuntimeClassLoader(dep.getInitialClassLoader());
+         
+         // TODO: Hack, should this become another DeploymentAspect?
+         ((ArchiveDeployment)dep).setRootFile(new ResourceLoaderAdapter());
+
+         // Create/Setup the service
+         Service service = dep.getService();
+         service.setContextRoot(context.getContextRoot());
+
+         // Create/Setup the endpoint
+         org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName());
+         ep.setShortName(implClass.getName()+"-Endpoint");
+         ep.setURLPattern("/*");
+         service.addEndpoint(ep);
+
+         // Deploy using deployment aspects
+         runtime.create(dep);  
+         runtime.start(dep);  
+      }
+      catch (RuntimeException rte)
+      {
+         throw rte;
+      }
+      catch (Exception ex)
+      {
+         throw new WebServiceException(ex);
+      }
+   }
+
+   /** Destroys an JAXWS endpoint on the HTTP server */
+   public void destroy(HttpContext context, Endpoint endpoint)
+   {
+      try
+      {
+         
+      }
+      catch (RuntimeException rte)
+      {
+         throw rte;
+      }
+      catch (Exception ex)
+      {
+         throw new WebServiceException(ex);
+      }
+   }
+
+   private Class getImplementorClass(Endpoint endpoint)
+   {
+      Object implementor = endpoint.getImplementor();
+      Class implClass = (implementor instanceof Class ? (Class)implementor : implementor.getClass());
+      return implClass;
+   }
+}
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WSFRuntimeDelegateHttpServer.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,85 @@
+/*
+ * 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.container.jboss50.transport;
+
+// $Id$
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifier;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.spi.transport.HttpSpec;
+
+/**
+ * Deploy the generated webapp to JBoss by attaching it
+ * to the {@link org.jboss.deployers.structure.spi.DeploymentUnit}
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @author Heiko.Braun at jboss.com
+ * 
+ * @since 12-May-2006
+ */
+public class WebAppDeploymentFactory
+{
+   // provide logging
+   private static Logger log = Logger.getLogger(WebAppDeploymentFactory.class);
+
+   private WebMetaDataModifier webMetaDataModifier;
+
+   public void setWebMetaDataModifier(WebMetaDataModifier webMetaDataModifier)
+   {
+      this.webMetaDataModifier = webMetaDataModifier;
+   }
+
+   /**
+    * Creates and attaches web meta data to a deployment unit
+    * @param dep    
+    * @return a mofified deployment unit
+    */
+   public DeploymentUnit create(Deployment dep, JBossWebMetaData jbwmd )
+   {
+      if (jbwmd == null)
+         throw new IllegalArgumentException("Web meta data is cannot be null");
+
+      DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
+      if (unit == null)
+         throw new IllegalStateException("Cannot obtain deployment unit");
+
+      try
+      {
+         webMetaDataModifier.modifyMetaData(dep);
+      
+         // Attaching it to the DeploymentUnit will cause a new webapp deployment
+         unit.addAttachment(JBossWebMetaData.class, jbwmd);
+         unit.addAttachment(HttpSpec.PROPERTY_GENERATED_WEBAPP, Boolean.TRUE);
+
+      }
+      catch (Exception ex)
+      {
+         WSFDeploymentException.rethrow(ex);
+      }
+
+      return unit;
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppDeploymentFactory.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,281 @@
+/*
+ * 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.container.jboss50.transport;
+
+// $Id$
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.AuthConstraintMetaData;
+import org.jboss.metadata.web.spec.LoginConfigMetaData;
+import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
+import org.jboss.metadata.web.spec.ServletMappingMetaData;
+import org.jboss.metadata.web.spec.TransportGuaranteeType;
+import org.jboss.metadata.web.spec.UserDataConstraintMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
+import org.jboss.wsf.spi.annotation.WebContext;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
+import org.jboss.wsf.spi.WSFRuntime;
+import org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandler;
+
+/**
+ * Generates a webapp for an EJB endpoint
+ * which will be process by {@link org.jboss.wsf.container.jboss50.transport.WebAppDeploymentFactory}
+ * 
+ * @author Thomas.Diesler at jboss.org
+ * @author Heiko.Braun at jboss.com
+ * 
+ * @since 13-Oct-2007
+ */
+public class WebAppGenerator
+{
+   private SecurityHandler securityHandlerEJB21;
+   private SecurityHandler securityHandlerEJB3;
+
+   public void setSecurityHandlerEJB21(SecurityHandler handler)
+   {
+      this.securityHandlerEJB21 = handler;
+   }
+
+   public void setSecurityHandlerEJB3(SecurityHandler handler)
+   {
+      this.securityHandlerEJB3 = handler;
+   }
+
+   public JBossWebMetaData create(Deployment dep)
+   {
+      JBossWebMetaData jbwmd = null;
+
+      String typeStr = dep.getType().toString();
+      if (typeStr.endsWith("EJB21"))
+      {
+         jbwmd = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21);
+         dep.addAttachment(JBossWebMetaData.class, jbwmd);
+      }
+      else if (typeStr.endsWith("EJB3"))
+      {
+         jbwmd = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB3);
+         dep.addAttachment(JBossWebMetaData.class, jbwmd);
+      }
+      else
+      {
+         jbwmd = generatWebDeployment((ArchiveDeployment)dep, null);
+         dep.addAttachment(JBossWebMetaData.class, jbwmd);
+      }
+
+      return jbwmd;
+   }
+
+   protected JBossWebMetaData generatWebDeployment(ArchiveDeployment dep, SecurityHandler securityHandler)
+   {
+      JBossWebMetaData jbwmd = new JBossWebMetaData();
+      createWebAppDescriptor(dep, jbwmd, securityHandler);
+      createJBossWebAppDescriptor(dep, jbwmd, securityHandler);
+      return jbwmd;
+   }
+
+   protected void createWebAppDescriptor(Deployment dep, JBossWebMetaData jbwmd, SecurityHandler securityHandler)
+   {
+      /*
+       <servlet>
+       <servlet-name>
+       <servlet-class>
+       </servlet>
+       */
+      JBossServletsMetaData servlets = jbwmd.getServlets();
+      for (Endpoint ep : dep.getService().getEndpoints())
+      {
+         JBossServletMetaData servlet = new JBossServletMetaData();
+         servlet.setServletName(ep.getShortName());
+         servlet.setServletClass(ep.getTargetBeanName());
+         servlets.add(servlet);
+      }
+
+      /*
+       <servlet-mapping>
+       <servlet-name>
+       <url-pattern>
+       </servlet-mapping>
+       */
+      for (Endpoint ep : dep.getService().getEndpoints())
+      {
+         List<ServletMappingMetaData> servletMappings = jbwmd.getServletMappings();
+         if (servletMappings == null)
+         {
+            servletMappings = new ArrayList<ServletMappingMetaData>();
+            jbwmd.setServletMappings(servletMappings);
+         }
+         ServletMappingMetaData servletMapping = new ServletMappingMetaData();
+         servletMapping.setServletName(ep.getShortName());
+         servletMapping.setUrlPatterns(Arrays.asList(new String[] { ep.getURLPattern() }));
+         servletMappings.add(servletMapping);
+      }
+
+      String authMethod = null;
+
+      // Add web-app/security-constraint for each port component
+      for (Endpoint ep : dep.getService().getEndpoints())
+      {
+         String ejbName = ep.getShortName();
+
+         Boolean secureWSDLAccess = null;
+         String transportGuarantee = null;
+         String beanAuthMethod = null;
+
+         WebContext anWebContext = (WebContext)ep.getTargetBeanClass().getAnnotation(WebContext.class);
+         if (anWebContext != null)
+         {
+            if (anWebContext.authMethod().length() > 0)
+               beanAuthMethod = anWebContext.authMethod();
+            if (anWebContext.transportGuarantee().length() > 0)
+               transportGuarantee = anWebContext.transportGuarantee();
+            if (anWebContext.secureWSDLAccess())
+               secureWSDLAccess = anWebContext.secureWSDLAccess();
+         }
+
+         EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class);
+         if (appMetaData != null && appMetaData.getBeanByEjbName(ejbName) != null)
+         {
+            EJBMetaData bmd = appMetaData.getBeanByEjbName(ejbName);
+            EJBSecurityMetaData smd = bmd.getSecurityMetaData();
+            if (smd != null)
+            {
+               beanAuthMethod = smd.getAuthMethod();
+               transportGuarantee = smd.getTransportGuarantee();
+               secureWSDLAccess = smd.getSecureWSDLAccess();
+            }
+         }
+
+         if (beanAuthMethod != null || transportGuarantee != null)
+         {
+            /*
+             <security-constraint>
+             <web-resource-collection>
+             <web-resource-name>TestUnAuthPort</web-resource-name>
+             <url-pattern>/HSTestRoot/TestUnAuth/*</url-pattern>
+             </web-resource-collection>
+             <auth-constraint>
+             <role-name>*</role-name>
+             </auth-constraint>
+             <user-data-constraint>
+             <transport-guarantee>NONE</transport-guarantee>
+             </user-data-constraint>
+             </security-constraint>
+             */
+            List<SecurityConstraintMetaData> securityContraints = jbwmd.getSecurityContraints();
+            if (securityContraints == null)
+            {
+               securityContraints = new ArrayList<SecurityConstraintMetaData>();
+               jbwmd.setSecurityContraints(securityContraints);
+            }
+            SecurityConstraintMetaData securityConstraint = new SecurityConstraintMetaData();
+            securityContraints.add(securityConstraint);
+            
+            WebResourceCollectionsMetaData resourceCollections = securityConstraint.getResourceCollections();
+            if (resourceCollections == null)
+            {
+               resourceCollections = new WebResourceCollectionsMetaData();
+               securityConstraint.setResourceCollections(resourceCollections);
+            }
+            WebResourceCollectionMetaData resourceCollection = new WebResourceCollectionMetaData();
+            resourceCollections.add(resourceCollection);
+            
+            resourceCollection.setWebResourceName(ejbName);
+            resourceCollection.setUrlPatterns(Arrays.asList(new String[] { ep.getURLPattern() }));
+            ArrayList<String> httpMethods = new ArrayList<String>();
+            resourceCollection.setHttpMethods(httpMethods);
+            if (Boolean.TRUE.equals(secureWSDLAccess))
+            {
+               httpMethods.add("GET");
+            }
+            httpMethods.add("POST");
+
+            // Optional auth-constraint
+            if (beanAuthMethod != null)
+            {
+               // Only the first auth-method gives the war login-config/auth-method
+               if (authMethod == null)
+                  authMethod = beanAuthMethod;
+
+               AuthConstraintMetaData authConstraint = new AuthConstraintMetaData();
+               authConstraint.setRoleNames(Arrays.asList(new String[] { "*" }));
+               securityConstraint.setAuthConstraint(authConstraint);
+            }
+            // Optional user-data-constraint
+            if (transportGuarantee != null)
+            {
+               UserDataConstraintMetaData userDataConstraint = new UserDataConstraintMetaData();
+               userDataConstraint.setTransportGuarantee(TransportGuaranteeType.valueOf(transportGuarantee));
+               securityConstraint.setUserDataConstraint(userDataConstraint);
+            }
+         }
+      }
+
+      // Optional login-config/auth-method
+      if (authMethod != null && securityHandler != null)
+      {
+         LoginConfigMetaData loginConfig = jbwmd.getLoginConfig();
+         if (loginConfig == null)
+         {
+            loginConfig = new LoginConfigMetaData();
+            jbwmd.setLoginConfig(loginConfig);
+         }
+         loginConfig.setAuthMethod(authMethod);
+         loginConfig.setRealmName("EJBServiceEndpointServlet Realm");
+
+         securityHandler.addSecurityRoles(jbwmd, dep);
+      }
+   }
+
+   protected void createJBossWebAppDescriptor(Deployment dep, JBossWebMetaData jbwmd, SecurityHandler securityHandler)
+   {
+      /* Create a jboss-web
+       <jboss-web>
+       <security-domain>java:/jaas/cts</security-domain>
+       <context-root>/ws/ejbN/</context-root>
+       <virtual-host>some.domain.com</virtual-host>
+       </jboss-web>
+       */
+      if (securityHandler != null)
+         securityHandler.addSecurityDomain(jbwmd, dep);
+
+      // Get the context root for this deployment
+      String contextRoot = dep.getService().getContextRoot();
+      if (contextRoot == null)
+         throw new WSFDeploymentException("Cannot obtain context root");
+
+      jbwmd.setContextRoot(contextRoot);
+   }
+}


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGenerator.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd"
+            xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- Locate the single instance of the kernel -->
+   <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+   </bean>
+
+   <!-- Locate the single instance of the MBeanServer -->
+   <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator">
+      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+   </bean>
+
+   <!-- The HTTPServer used by the JAXWS Endpoint API -->
+   <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.transport.WSFRuntimeDelegateHttpServer"/>
+  
+   <!--
+   *********************************************************************************************************************
+   Main WSFRuntimes.
+   -->
+
+   <bean name="WebserviceJSERuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime">
+      <property name="runtimeName">WebserviceJSERuntime</property>      
+      <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+      <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property>
+      <property name="transportManagerFactory"><inject bean="JSETransportManagerFactory"/></property>
+      <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property>
+      <property name="requestHandlerFactory"><inject bean="StackRequestHandlerFactory"/></property>
+   </bean>
+
+   <bean name="WebserviceEJBRuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime">
+      <property name="runtimeName">WebserviceEJBRuntime</property>
+      <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+      <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property>
+      <property name="transportManagerFactory"><inject bean="EJBTransportManagerFactory"/></property>
+      <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property>
+      <property name="requestHandlerFactory"><inject bean="StackRequestHandlerFactory"/></property>
+   </bean>
+
+   <bean name="EndpointAPIRuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime">
+      <property name="runtimeName">EndpointAPIRuntime</property>
+      <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+      <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property>      
+      <property name="transportManagerFactory"><inject bean="EndpointAPITransportManagerFactory"/></property>      
+      <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property>
+      <property name="requestHandlerFactory"><inject bean="StackRequestHandlerFactory"/></property>
+   </bean>
+
+   <!--
+   *********************************************************************************************************************
+   WSFRuntimes Components
+   -->
+
+   <!-- The registry for web service endpoints -->
+   <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+      <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+   </bean>
+
+   <!-- JSE transport -->
+   <bean name="JSETransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory">
+      <property name="httpTransport"><inject bean="JSEHttpTransport"/></property>      
+   </bean>
+
+   <!-- EJB transport -->
+   <bean name="EJBTransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory">
+      <property name="httpTransport"><inject bean="EJBHttpTransport"/></property>
+   </bean>
+
+   <!-- Endpoint API transport -->
+   <bean name="EndpointAPITransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory">
+      <property name="httpTransport"><inject bean="EndpointAPIHttpTransport"/></property>
+   </bean>
+
+   <bean name="JSEHttpTransport" class="org.jboss.wsf.container.jboss50.transport.NoopHttpTransportManager"/>
+
+   <bean name="EJBHttpTransport" class="org.jboss.wsf.container.jboss50.transport.EJBHttpTransportManager">
+      <property name="generator"><inject bean="WSWebAppGenerator"/></property>
+      <property name="deploymentFactory"><inject bean="WSWebAppDeploymentFactory"/></property>      
+   </bean>
+
+   <bean name="EndpointAPIHttpTransport" class="org.jboss.wsf.container.jboss50.transport.EndpointAPIHttpTransportManager">
+      <property name="generator"><inject bean="WSWebAppGenerator"/></property>
+      <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+      <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
+   </bean>
+
+   <!-- Dynamically creates web apps in memory -->
+   <bean name="WSWebAppGenerator" class="org.jboss.wsf.container.jboss50.transport.WebAppGenerator">
+      <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
+      <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
+   </bean>
+
+   <!-- Attaches a web meta data to the deployment unit -->
+   <bean name="WSWebAppDeploymentFactory" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentFactory">
+      <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
+   </bean>
+   
+   <!-- invcocation handling -->
+   <bean name="InvocationHandlerFactory" class="org.jboss.wsf.container.jboss50.invocation.InvocationHandlerFactoryImpl"/>
+
+   <!--
+   *********************************************************************************************************************
+   Each DeploymentAspectManger maintains a list of DeploymentAspects which are installed by an AspectInstaller
+   -->
+
+   <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+      <property name="name">WSDeploymentAspectManagerJSE</property>
+   </bean>
+
+   <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+      <property name="name">WSDeploymentAspectManagerEJB</property>
+   </bean>
+   <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+      <property name="name">WSDeploymentAspectManagerEndpointAPI</property>
+   </bean>
+
+   <!--
+   *********************************************************************************************************************
+   The container deployment aspects
+   -->
+
+   <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect">
+      <property name="provides">ContainerMetaData, VFSRoot</property>
+   </bean>
+
+   <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
+      <property name="requires">ContainerMetaData</property>
+      <property name="provides">ContextRoot</property>
+   </bean>
+   
+   <bean name="WSHttpTransportDeploymentAspect" class="org.jboss.wsf.framework.deployment.HttpTransportDeploymentAspect">
+      <property name="requires">URLPattern,ContextProperties</property>
+      <property name="provides">EndpointAddress</property>
+   </bean>
+
+   <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
+      <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property>
+   </bean>
+
+   <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+      <property name="requires">ContainerMetaData</property>
+      <property name="provides">ContainerEndpointHandler</property>
+   </bean>
+
+   <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
+      <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
+   </bean>
+
+   <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
+      <property name="provides">EndpointMetrics</property>
+   </bean>
+
+   <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
+      <property name="requires">URLPattern</property>
+      <property name="provides">EndpointName</property>
+   </bean>
+
+   <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
+      <property name="requires">EndpointName</property>
+      <property name="provides">RegisteredEndpoint</property>
+      <depends>WSEndpointRegistry</depends>
+   </bean>
+
+   <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.tomcat.ModifyWebMetaDataDeploymentAspect">
+      <property name="requires">ContextProperties, StackDescriptor</property>
+      <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
+   </bean>
+
+   <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.RuntimeLoaderDeploymentAspect">
+      <property name="requires">ContainerMetaData</property>
+      <property name="provides">RuntimeLoader</property>
+   </bean>
+
+   <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect">
+      <property name="requires">ContextRoot, ContainerMetaData</property>
+      <property name="provides">URLPattern</property>
+   </bean>
+
+   <!--
+   *********************************************************************************************************************
+   Deployment aspect helper beans
+   -->
+   <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB21"/>
+   <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB3"/>
+   <bean name="WSWebMetaDataModifier" class="org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifierImpl"/>
+
+   <!--
+   *********************************************************************************************************************
+   Deployment aspect installers
+   -->
+
+   <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+      <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+      <property name="sortAspectsOnCreate">false</property>
+      <property name="aspects">
+         <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+
+            <!-- phase 1 -->
+            <inject bean="WSContainerMetaDataDeploymentAspect"/>
+            <inject bean="WSContextRootDeploymentAspect"/>
+            <inject bean="WSHttpTransportDeploymentAspect"/>
+            <inject bean="WSEndpointHandlerDeploymentAspect"/>
+            <inject bean="WSEndpointMetricsDeploymentAspect"/>
+            <inject bean="WSEndpointNameDeploymentAspect"/>
+            <inject bean="WSEndpointRegistryDeploymentAspect"/>
+            <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
+            <inject bean="WSURLPatternDeploymentAspect"/>
+
+            <!-- phase 2 -->
+            <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+            <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+         </set>
+      </property>
+   </bean>
+
+   <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+      <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+      <property name="sortAspectsOnCreate">false</property>
+      <property name="aspects">
+         <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+            <inject bean="WSContainerMetaDataDeploymentAspect"/>
+            <inject bean="WSContextRootDeploymentAspect"/>
+            <inject bean="WSHttpTransportDeploymentAspect"/>
+            <inject bean="WSEndpointHandlerDeploymentAspect"/>
+            <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+            <inject bean="WSEndpointMetricsDeploymentAspect"/>
+            <inject bean="WSEndpointNameDeploymentAspect"/>
+            <inject bean="WSEndpointRegistryDeploymentAspect"/>
+            <inject bean="WSURLPatternDeploymentAspect"/>            
+            
+            <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+         </set>
+      </property>
+   </bean>
+
+   <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+      <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+      <property name="sortAspectsOnCreate">false</property>
+      <property name="aspects">
+         <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">            
+            <inject bean="WSEndpointAPIDeploymentAspect"/>
+            <inject bean="WSHttpTransportDeploymentAspect"/>
+            <inject bean="WSEndpointHandlerDeploymentAspect"/>
+            <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+            <inject bean="WSEndpointMetricsDeploymentAspect"/>
+            <inject bean="WSEndpointNameDeploymentAspect"/>
+            <inject bean="WSEndpointRegistryDeploymentAspect"/>            
+         </set>
+      </property>
+   </bean>
+
+</deployment>
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd"
+            xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- *********************************************************************************************************************
+  Web Service deployment
+
+  There are two deployers registered with the JBoss Main Deployer.
+  The order of which is important
+
+  1) EJBDeployer < WebServiceDeployerEJB < WarDeployer
+  2) WebServiceDeployerPreJSE < WarDeployer
+  3) WarDeployer < WebServiceDeployerPostJSE
+
+  Each WebServiceDeployer has a number of DeployerHooks registered with it
+
+  - WebServiceDeployerEJB
+  - WSDeployerHook_JAXRPC_EJB21
+  - WSDeployerHook_JAXWS_EJB3
+
+  - WebServiceDeployerPreJSE
+  - WSDeployerHook_JAXRPC_JSE
+  - WSDeployerHook_JAXWS_JSE
+
+  Conceptually, each of these hooks implements the following pattern:
+
+  DeployerHook.deploy(unit)
+  if(isWebServiceDeployment)
+    Deployment dep = createDeployment(unit)
+    DeploymentAspectManager.deploy(dep)
+
+  DeployerHook.undeploy(unit)
+  Deployment dep = getDeployment(unit)
+  WSFRuntime.start(dep)
+
+  Each deployer hook has a web service WSFRuntime injected into it.
+    
+  ********************************************************************************************************************* -->
+
+   <!--
+   A web service deployer that hooks in after the EJB deployers
+   -->
+   <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB">
+      <depends>EJB2xDeployer</depends>
+      <depends>Ejb3Deployer</depends>
+   </bean>
+
+   <!--
+   A web service deployer that hooks in before the WAR deployer
+   -->
+   <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE">
+      <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property>
+      <depends>WebAppParsingDeployer</depends>
+   </bean>
+
+   <!--
+   A web service deployer that hooks in after the WAR deployer
+   -->
+   <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE">
+      <depends>WarDeployer</depends>
+   </bean>
+
+   <!--
+   Register DeployerHooks with JBoss deployers
+   -->
+
+   <!-- Phase 1 of JSE JAX-RPC -->
+   <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookPreJSE">
+      <property name="runtimeName">WebserviceJSERuntime</property>
+      <install bean="WebServiceDeployerPreJSE" method="addDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <depends>WebServiceDeployerPreJSE</depends>
+   </bean>
+   <!-- Phase 2 of JSE JAX-RPC -->
+   <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookPostJSE">
+      <property name="runtimeName">WebserviceJSERuntime</property>
+      <install bean="WebServiceDeployerPostJSE" method="addDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <depends>WebServiceDeployerPostJSE</depends>
+   </bean>
+
+   <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookEJB21">
+      <property name="runtimeName">WebserviceEJBRuntime</property>
+      <install bean="WebServiceDeployerEJB" method="addDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <depends>WebServiceDeployerEJB</depends>
+   </bean>
+
+   <!-- Phase 1 of JSE JAX-WS-->
+   <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookPreJSE">
+      <property name="runtimeName">WebserviceJSERuntime</property>
+      <install bean="WebServiceDeployerPreJSE" method="addDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <depends>WebServiceDeployerPreJSE</depends>
+   </bean>
+   <!-- Phase 2 of JSE JAX-WS -->
+   <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookPostJSE">
+      <property name="runtimeName">WebserviceJSERuntime</property>
+      <install bean="WebServiceDeployerPostJSE" method="addDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <depends>WebServiceDeployerPostJSE</depends>
+   </bean>
+
+   <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookEJB3">
+      <property name="runtimeName">WebserviceEJBRuntime</property>
+      <install bean="WebServiceDeployerEJB" method="addDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </install>
+      <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook">
+         <parameter>
+            <this/>
+         </parameter>
+      </uninstall>
+      <depends>WebServiceDeployerEJB</depends>
+   </bean>
+
+</deployment>
\ No newline at end of file


Property changes on: container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.WSFRuntimeLocator	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.DefaultWSFRuntimeLocator
\ No newline at end of file

Added: container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory
\ No newline at end of file

Added: container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss50.invocation.InvocationHandlerFactoryImpl
\ No newline at end of file

Added: container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss50.invocation.SecurityAdapterFactoryImpl
\ No newline at end of file

Added: container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss50.invocation.WebServiceContextFactoryImpl
\ No newline at end of file

Added: container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
===================================================================
--- container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.management.ServerConfigFactoryImpl
\ No newline at end of file

Added: container/jboss50/branches/jbossws-jboss501/version.properties
===================================================================
--- container/jboss50/branches/jbossws-jboss501/version.properties	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/version.properties	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1,44 @@
+
+# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler at jboss.com $
+
+specification.title=JBossWS
+specification.vendor=JBoss (http://www.jboss.org)
+specification.version=jbossws-3.0
+
+version.id=5.0.0.DEV
+repository.id=5.0.0.DEV
+
+implementation.title=JBoss Web Services - Integration JBoss42
+implementation.url=http://www.jboss.org/products/jbossws
+implementation.vendor=JBoss Inc.
+implementation.vendor.id=http://www.jboss.org
+
+# Dependend integration projects
+jbossws=snapshot
+jbossws-spi=3.0.0.DEV
+jbossws-common=snapshot
+jbossws-framework=3.0.2.DEV
+
+# JBossAS-5.0
+jboss-jbossxb-jboss50=2.0.0.CR5
+jboss-remoting-jboss50=2.4.0.Beta2
+
+# Thirdparty library versions
+apache-xerces=2.9.0
+dom4j=1.6.1
+
+jboss-common-core=2.2.3.GA
+jboss-common-logging-log4j=2.0.2.GA
+jboss-common-logging-spi=2.0.2.GA
+jboss-javaee=5.0.0.Beta3
+jboss-jaxbintros=1.0.0.beta2
+
+jboss-microcontainer=2.0.0.Beta11
+jboss-reflect=2.0.0.Beta12
+jboss-mdr=2.0.0.Beta12
+
+jboss-security=4.0.5.GA
+jboss-vfs=2.0.0.Beta2
+jbossas-core-libs=4.2.0.GA
+
+sun-servlet=2.4

Added: container/jboss50/branches/jbossws-jboss501/version.properties.md5
===================================================================
--- container/jboss50/branches/jbossws-jboss501/version.properties.md5	                        (rev 0)
+++ container/jboss50/branches/jbossws-jboss501/version.properties.md5	2008-04-10 18:29:28 UTC (rev 6342)
@@ -0,0 +1 @@
+5c7d33d0b9260374658e49a6c3e727dc




More information about the jbossws-commits mailing list