May 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r7101 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-20 06:50:58 -0400 (Tue, 20 May 2008) New Revision: 7101 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java Log: don't rely on fact methods are called in order they are declared - this is wrong assumption :( Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2008-05-20 10:14:54 UTC (rev 7100) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase.java 2008-05-20 10:50:58 UTC (rev 7101) @@ -61,7 +61,7 @@ protected void setUp() throws Exception { super.setUp(); - + if (initial == null) { Service initialService = (Service)getInitialContext("initial-client").lookup("java:comp/env/service/InitialService"); @@ -75,10 +75,19 @@ faultto = (FaultToEndpoint) service.getPort(FaultToEndpoint.class); } } + + public void testScenario() throws Exception + { + _testReplyToMessage(); + _testFaultToMessage(); + _testInital(); + _testReplyTo(); + _testFaultTo(); + } /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again. */ - public void testReplyToMessage() throws Exception + public void _testReplyToMessage() throws Exception { String reqEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + @@ -102,7 +111,7 @@ /** This sends a fault message to the FaultTo endpoint and verfies whether we can read it of again. */ - public void testFaultToMessage() throws Exception + public void _testFaultToMessage() throws Exception { String reqEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + @@ -125,7 +134,7 @@ assertEquals("java.lang.IllegalArgumentException: Mars Bar", faultto.getLastFault()); } - public void testInital() throws Exception + public void _testInital() throws Exception { String item = initial.addItem("Ice Cream"); assertNull("Expected null, but was: " + item, item); @@ -134,13 +143,13 @@ assertNull("Expected null, but was: " + item, item); } - public void testReplyTo() throws Exception + public void _testReplyTo() throws Exception { String item = replyto.getLastItem(); assertEquals("Ice Cream", item); } - public void testFaultTo() throws Exception + public void _testFaultTo() throws Exception { String lastFault = faultto.getLastFault();

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7100 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-20 06:14:54 -0400 (Tue, 20 May 2008) New Revision: 7100 Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt Log: [JBWS-2175] exclude tests for now Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-20 09:59:41 UTC (rev 7099) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-20 10:14:54 UTC (rev 7100) @@ -25,3 +25,5 @@ # [JBWS-1911] Support the JMS transport with JAX-WS org/jboss/test/ws/jaxws/samples/jmstransport/** +# [JBWS-2175] wsconsume cannot run with jaxws-api from build output +org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-20 09:59:41 UTC (rev 7099) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-20 10:14:54 UTC (rev 7100) @@ -37,3 +37,5 @@ # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** +# [JBWS-2175] wsconsume cannot run with jaxws-api from build output +org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-20 09:59:41 UTC (rev 7099) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-20 10:14:54 UTC (rev 7100) @@ -21,3 +21,5 @@ # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** +# [JBWS-2175] wsconsume cannot run with jaxws-api from build output +org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-20 09:59:41 UTC (rev 7099) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-20 10:14:54 UTC (rev 7100) @@ -30,3 +30,5 @@ # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** +# [JBWS-2175] wsconsume cannot run with jaxws-api from build output +org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-20 09:59:41 UTC (rev 7099) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-20 10:14:54 UTC (rev 7100) @@ -69,3 +69,6 @@ # [JBWS-2171] JBossClientMetaData.class not found org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.* + +# [JBWS-2175] wsconsume cannot run with jaxws-api from build output +org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7099 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1857.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-20 05:59:41 -0400 (Tue, 20 May 2008) New Revision: 7099 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1857/JBWS1857TestCase.java Log: prepare clear test environment Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1857/JBWS1857TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1857/JBWS1857TestCase.java 2008-05-19 23:05:40 UTC (rev 7098) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1857/JBWS1857TestCase.java 2008-05-20 09:59:41 UTC (rev 7099) @@ -40,6 +40,11 @@ */ public class JBWS1857TestCase extends JBossWSTest { + public void setUp() throws Exception + { + JAXBContextFactory.resetContextCount(); + } + public void testPortCreation() throws Exception { File wsdlFile = getResourceFile("jaxws/jbws1857/StammdatenService.wsdl");

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7098 - stack/native/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-19 19:05:40 -0400 (Mon, 19 May 2008) New Revision: 7098 Modified: stack/native/trunk/pom.xml Log: Exclude sun stax impl Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-19 14:27:24 UTC (rev 7097) +++ stack/native/trunk/pom.xml 2008-05-19 23:05:40 UTC (rev 7098) @@ -224,6 +224,12 @@ <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-tools</artifactId> <version>${sun.jaxws.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.xml.stream</groupId> + <artifactId>sjsxp</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.xml.ws</groupId>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7097 - in stack/cxf/trunk: src/main/distro and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-19 10:27:24 -0400 (Mon, 19 May 2008) New Revision: 7097 Added: stack/cxf/trunk/src/main/distro/build-project-gen.xml stack/cxf/trunk/src/main/distro/user-project-build.xml Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/src/main/distro/build.xml stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-2029] Project generator in CXF stack Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-19 14:26:29 UTC (rev 7096) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-19 14:27:24 UTC (rev 7097) @@ -98,9 +98,6 @@ # [JBWS-2097] Unlock WS-ReliableMessaging in all stacks org/jboss/test/ws/jaxws/wsrm/** -# [JBWS-2029] Make the project generator available for all stacks -org/jboss/test/ws/projectGenerator/** - # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-19 14:26:29 UTC (rev 7096) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-19 14:27:24 UTC (rev 7097) @@ -98,9 +98,6 @@ # [JBWS-2097] Unlock WS-ReliableMessaging in all stacks org/jboss/test/ws/jaxws/wsrm/** -# [JBWS-2029] Make the project generator available for all stacks -org/jboss/test/ws/projectGenerator/** - # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-19 14:26:29 UTC (rev 7096) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-19 14:27:24 UTC (rev 7097) @@ -106,9 +106,6 @@ # [JBWS-2097] Unlock WS-ReliableMessaging in all stacks org/jboss/test/ws/jaxws/wsrm/** -# [JBWS-2029] Make the project generator available for all stacks -org/jboss/test/ws/projectGenerator/** - # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-19 14:26:29 UTC (rev 7096) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-19 14:27:24 UTC (rev 7097) @@ -121,9 +121,6 @@ org/jboss/test/ws/jaxws/samples/webserviceref/** org/jboss/test/ws/jaxws/samples/webservice/** -# [JBWS-2029] Make the project generator available for all stacks -org/jboss/test/ws/projectGenerator/** - # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** Added: stack/cxf/trunk/src/main/distro/build-project-gen.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-project-gen.xml (rev 0) +++ stack/cxf/trunk/src/main/distro/build-project-gen.xml 2008-05-19 14:27:24 UTC (rev 7097) @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <target name="init-project-properties" depends="tests-init"> + <fail message="Did you copy the ant.properties.example to ant.properties?" unless="jboss.home"/> + <property file="./user-project.properties" /> + <property name="project.home" value="${workspace.home}/${project.name}"/> + + <filterset id="project"> + <filter token="projectName" value="${project.name}" /> + <filter token="jbossHome" value="${project.jboss.home}" /> + </filterset> + + <path id="jbws-ant.path"> + <pathelement location="${thirdparty.dir}/jbossws-common.jar" /> + </path> + <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/> + <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/> + <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/> + <taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/> + </target> + + <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project"> + <property file="./user-project.properties" prefix="old" /> + + <echo message="-------------------------------------------------"/> + <echo message=" Welcome to the JBossWS user project generator"/> + <echo message="-------------------------------------------------"/> + <echo message=""/> + + <property name="old.workspace.home" value="C:/Projects"/> + <input addproperty="workspace.home.new" + message="Enter your Java project workspace (the directory that contains your projects) " + defaultvalue="${old.workspace.home}"/> + <pathFixer property="workspace.home.new" /> + + <property name="old.project.name" value="myproject"/> + <input addproperty="project.name.new" + message="Enter the project name " + defaultvalue="${old.project.name}"/> + + <property name="old.project.type" value="jar"/> + <input addproperty="project.type.new" + message="Is this project deployed as an JAR (with EJB3 components) or a WAR (with no EJB3 support) " + validargs="jar,war" + defaultvalue="${old.project.type}"/> + + <delete file="user-project.properties"/> + <propertyfile file="user-project.properties" comment="Generated by JBossWS user project setup"> + <entry key="workspace.home" value="${workspace.home.new}"/> + <entry key="project.name" value="${project.name.new}"/> + <entry key="project.type" value="${project.type.new}"/> + <entry key="project.jboss.home" value="${jboss.home}"/> + <entry key="project.jboss.conf" value="${jboss.server.instance}"/> + </propertyfile> + + <echo message=""/> + <echo message="Your project settings have been saved in file 'user-project.properties'."/> + <echo message="Please type 'ant create-project' to create the new project."/> + </target> + + <target name="create-project" depends="validate-settings, configure-project" description="Create a new user project"> + <echo message="A basic webservice project named '${project.name}' has been created in the ${workspace.home} directory."/> + <echo message="It includes a simple Ant build file and references the required libraries."/> + <echo message="Please refer to http://jbws.dyndns.org/mediawiki/index.php?title=JBossWS for the authoritative documentation."/> + <echo message=""/> + <echo message="If you are an Eclipse user, import the project into Eclipse: right click in "/> + <echo message="'Package Explorer -> Import...' and select 'General -> Existing Projects into Workspace'."/> + <echo message="Then click on 'Next' and set the root directory browsing to your workspace directory."/> + </target> + + <target name="validate-settings" depends="init-project-properties"> + <fail message="No project name specified (run 'ant setup-new-project' first)"> + <condition> + <or> + <not><isset property="project.name"/></not> + <equals arg1="${project.name}" arg2=""/> + </or> + </condition> + </fail> + <fail message="No project workspace specified (run 'ant setup-new-project' first)"> + <condition> + <or> + <not><isset property="workspace.home"/></not> + <equals arg1="${workspace.home}" arg2=""/> + </or> + </condition> + </fail> + </target> + + <target name="configure-project"> + <mkdir dir="${project.home}/src/main/java"/> + <mkdir dir="${project.home}/src/main/resources"/> + <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> + <filterset refid="project"/> + </copy> + <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> + <path id="project.classpath"> + <pathelement location="${jboss.client}/jbossws-common.jar"/> + <pathelement location="${jboss.client}/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/jbossws-cxf-client.jar"/> + <pathelement location="${jboss.client}/geronimo-ws-metadata_2.0_spec.jar"/> + <path refid="integration.target.javac.classpath" /> + </path> + <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" /> + <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" /> + <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" /> + </target> + + <target name="delete-project" depends="validate-settings" description="Delete the configured user project"> + <echo message="Deleting the entire project in ${project.home}" /> + <delete dir="${project.home}" /> + </target> + + <target name="settings" depends="init-project-properties" description="Print the current project settings"> + <echo message="Java project workspace: ${workspace.home}"/> + <echo message="JBoss home: ${project.jboss.home}"/> + <echo message="JBoss conf: ${project.jboss.conf}"/> + <echo message="Project name: ${project.name}"/> + <echo message="Project type: ${project.type}"/> + </target> + +</project> \ No newline at end of file Property changes on: stack/cxf/trunk/src/main/distro/build-project-gen.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2008-05-19 14:26:29 UTC (rev 7096) +++ stack/cxf/trunk/src/main/distro/build.xml 2008-05-19 14:27:24 UTC (rev 7097) @@ -37,6 +37,7 @@ <import file="${build.dir}/build-deploy.xml"/> <import file="${build.dir}/jbossws-deploy-macros.xml"/> <import file="${tests.dir}/ant-import/build-testsuite.xml"/> + <import file="${build.dir}/build-project-gen.xml"/>   Added: stack/cxf/trunk/src/main/distro/user-project-build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/user-project-build.xml (rev 0) +++ stack/cxf/trunk/src/main/distro/user-project-build.xml 2008-05-19 14:27:24 UTC (rev 7097) @@ -0,0 +1,69 @@ +<?xml version="1.0"?> +<project name="@projectName@" default="deploy" basedir="." > + + <property file="${basedir}/build.properties" /> + <import file="libraries.xml" /> + +  + <property name="project.name" value="@projectName@" /> + <property name="dist.dir" value="dist" /> + <property name="deploy.dir" value="${project.jboss.home}/server/${project.jboss.conf}/deploy" /> + <property name="output.dir" value="output" /> + <property name="src.main.dir" value="src/main/java" /> + <property name="resources.main.dir" value="src/main/resources" /> + <property name="classes.main.dir" value="classes/main/java" /> + <property name="javac.debug" value="true" /> + <property name="javac.deprecation" value="false" /> + + <condition property="project.war" value="true"> + <equals arg1="${project.type}" arg2="war"/> + </condition> + + <target name="clean"> + <delete dir="${output.dir}" /> + <delete dir="${dist.dir}" /> + </target> + + <target name="init"> + <mkdir dir="${output.dir}" /> + <mkdir dir="${dist.dir}" /> + </target> + + <target name="compile" depends="init" description="Compile the Java source code" unless="eclipse.running"> + <tstamp/> + <javac destdir="${output.dir}" classpathref="project.classpath" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on"> + <src path="${src.main.dir}" /> + </javac> + </target> + + <target name="copyclasses" depends="init" description="Copy the classes that were compiled by Eclipse" if="eclipse.running"> + <copy todir="${output.dir}"> + <fileset dir="${classes/main}"> + <include name="**/*.class"/> + </fileset> + </copy> + </target> + + <target name="dist" depends="clean,compile,copyclasses" description="Create the application distribution archive"> + <fail unless="project.type">project.type not set</fail> + <jar jarfile="${dist.dir}/${project.name}.${project.type}"> + <fileset dir="${output.dir}" /> + <fileset dir="${resources.main.dir}"> + <include name="META-INF/**"/> + <include name="WEB-INF/**" if="project.war" /> + </fileset> + </jar> + </target> + + <target name="deploy" depends="dist" description="Deploy to JBoss AS"> + <fail unless="project.jboss.home">project.jboss.home not set</fail> + <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.${project.type}" /> + </target> + + <target name="undeploy" description="Undeploy from JBoss AS"> + <fail unless="project.jboss.home">project.jboss.home not set</fail> + <fail unless="project.jboss.conf">project.jboss.conf not set</fail> + <delete file="${deploy.dir}/${project.name}.${project.type}" /> + </target> + +</project> Property changes on: stack/cxf/trunk/src/main/distro/user-project-build.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-19 14:26:29 UTC (rev 7096) +++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-19 14:27:24 UTC (rev 7097) @@ -33,6 +33,8 @@ <include>build-setup.xml</include> <include>jbossws-default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> + <include>build-project-gen.xml</include> + <include>user-project-build.xml</include> </includes> </fileSet>  @@ -82,8 +84,12 @@ <unpackOptions> <includes> <include>ant-import/**</include> + <include>java/org/jboss/test/ws/console/**</include> <include>java/org/jboss/test/ws/jaxws/samples/**</include> + <include>java/org/jboss/test/ws/projectGenerator/**</include> + <include>resources/console/**</include> <include>resources/jaxws/samples/**</include> + <include>resources/projectGenerator/**</include> </includes> </unpackOptions> </dependencySet>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7096 - stack/metro/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-19 10:26:29 -0400 (Mon, 19 May 2008) New Revision: 7096 Modified: stack/metro/trunk/src/main/distro/build-project-gen.xml Log: [JBWS-2029] fixing classpath Modified: stack/metro/trunk/src/main/distro/build-project-gen.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-project-gen.xml 2008-05-19 13:47:01 UTC (rev 7095) +++ stack/metro/trunk/src/main/distro/build-project-gen.xml 2008-05-19 14:26:29 UTC (rev 7096) @@ -110,12 +110,8 @@ <path id="project.classpath"> <pathelement location="${jboss.client}/jbossws-common.jar"/> <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jbossws-native-jaxrpc.jar"/> - <pathelement location="${jboss.client}/jbossws-native-jaxws.jar"/> - <pathelement location="${jboss.client}/jbossws-native-jaxws-ext.jar"/> - <pathelement location="${jboss.client}/jbossws-native-saaj.jar"/> - <pathelement location="${jboss.client}/jbossws-native-core.jar"/> - <pathelement location="${jboss.client}/jbossws-native-client.jar"/> + <pathelement location="${jboss.client}/jbossws-metro-wsit-rt.jar"/> + <pathelement location="${jboss.client}/jbossws-metro-client.jar"/> <path refid="integration.target.javac.classpath" /> </path> <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" />

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7095 - in stack/metro/trunk: src/main/distro and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-19 09:47:01 -0400 (Mon, 19 May 2008) New Revision: 7095 Added: stack/metro/trunk/src/main/distro/build-project-gen.xml stack/metro/trunk/src/main/distro/user-project-build.xml Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt stack/metro/trunk/src/main/distro/build.xml stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-2029] Project generator in Metro stack Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-19 11:54:59 UTC (rev 7094) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-19 13:47:01 UTC (rev 7095) @@ -71,9 +71,6 @@ # UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* -# [JBWS-2029] Make the project generator available for all stacks -org/jboss/test/ws/projectGenerator/** - # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-19 11:54:59 UTC (rev 7094) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-19 13:47:01 UTC (rev 7095) @@ -71,9 +71,6 @@ # UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* -# [JBWS-2029] Make the project generator available for all stacks -org/jboss/test/ws/projectGenerator/** - # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-19 11:54:59 UTC (rev 7094) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-19 13:47:01 UTC (rev 7095) @@ -77,9 +77,6 @@ # UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* -# [JBWS-2029] Make the project generator available for all stacks -org/jboss/test/ws/projectGenerator/** - # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-19 11:54:59 UTC (rev 7094) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-19 13:47:01 UTC (rev 7095) @@ -92,9 +92,6 @@ # UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* -# [JBWS-2029] Make the project generator available for all stacks -org/jboss/test/ws/projectGenerator/** - # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** Added: stack/metro/trunk/src/main/distro/build-project-gen.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-project-gen.xml (rev 0) +++ stack/metro/trunk/src/main/distro/build-project-gen.xml 2008-05-19 13:47:01 UTC (rev 7095) @@ -0,0 +1,139 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <target name="init-project-properties" depends="tests-init"> + <fail message="Did you copy the ant.properties.example to ant.properties?" unless="jboss.home"/> + <property file="./user-project.properties" /> + <property name="project.home" value="${workspace.home}/${project.name}"/> + + <filterset id="project"> + <filter token="projectName" value="${project.name}" /> + <filter token="jbossHome" value="${project.jboss.home}" /> + </filterset> + + <path id="jbws-ant.path"> + <pathelement location="${thirdparty.dir}/jbossws-common.jar" /> + </path> + <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/> + <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/> + <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/> + <taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/> + </target> + + <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project"> + <property file="./user-project.properties" prefix="old" /> + + <echo message="-------------------------------------------------"/> + <echo message=" Welcome to the JBossWS user project generator"/> + <echo message="-------------------------------------------------"/> + <echo message=""/> + + <property name="old.workspace.home" value="C:/Projects"/> + <input addproperty="workspace.home.new" + message="Enter your Java project workspace (the directory that contains your projects) " + defaultvalue="${old.workspace.home}"/> + <pathFixer property="workspace.home.new" /> + + <property name="old.project.name" value="myproject"/> + <input addproperty="project.name.new" + message="Enter the project name " + defaultvalue="${old.project.name}"/> + + <property name="old.project.type" value="jar"/> + <input addproperty="project.type.new" + message="Is this project deployed as an JAR (with EJB3 components) or a WAR (with no EJB3 support) " + validargs="jar,war" + defaultvalue="${old.project.type}"/> + + <delete file="user-project.properties"/> + <propertyfile file="user-project.properties" comment="Generated by JBossWS user project setup"> + <entry key="workspace.home" value="${workspace.home.new}"/> + <entry key="project.name" value="${project.name.new}"/> + <entry key="project.type" value="${project.type.new}"/> + <entry key="project.jboss.home" value="${jboss.home}"/> + <entry key="project.jboss.conf" value="${jboss.server.instance}"/> + </propertyfile> + + <echo message=""/> + <echo message="Your project settings have been saved in file 'user-project.properties'."/> + <echo message="Please type 'ant create-project' to create the new project."/> + </target> + + <target name="create-project" depends="validate-settings, configure-project" description="Create a new user project"> + <echo message="A basic webservice project named '${project.name}' has been created in the ${workspace.home} directory."/> + <echo message="It includes a simple Ant build file and references the required libraries."/> + <echo message="Please refer to http://jbws.dyndns.org/mediawiki/index.php?title=JBossWS for the authoritative documentation."/> + <echo message=""/> + <echo message="If you are an Eclipse user, import the project into Eclipse: right click in "/> + <echo message="'Package Explorer -> Import...' and select 'General -> Existing Projects into Workspace'."/> + <echo message="Then click on 'Next' and set the root directory browsing to your workspace directory."/> + </target> + + <target name="validate-settings" depends="init-project-properties"> + <fail message="No project name specified (run 'ant setup-new-project' first)"> + <condition> + <or> + <not><isset property="project.name"/></not> + <equals arg1="${project.name}" arg2=""/> + </or> + </condition> + </fail> + <fail message="No project workspace specified (run 'ant setup-new-project' first)"> + <condition> + <or> + <not><isset property="workspace.home"/></not> + <equals arg1="${workspace.home}" arg2=""/> + </or> + </condition> + </fail> + </target> + + <target name="configure-project"> + <mkdir dir="${project.home}/src/main/java"/> + <mkdir dir="${project.home}/src/main/resources"/> + <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> + <filterset refid="project"/> + </copy> + <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> + <path id="project.classpath"> + <pathelement location="${jboss.client}/jbossws-common.jar"/> + <pathelement location="${jboss.client}/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/jbossws-native-jaxrpc.jar"/> + <pathelement location="${jboss.client}/jbossws-native-jaxws.jar"/> + <pathelement location="${jboss.client}/jbossws-native-jaxws-ext.jar"/> + <pathelement location="${jboss.client}/jbossws-native-saaj.jar"/> + <pathelement location="${jboss.client}/jbossws-native-core.jar"/> + <pathelement location="${jboss.client}/jbossws-native-client.jar"/> + <path refid="integration.target.javac.classpath" /> + </path> + <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" /> + <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" /> + <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" /> + </target> + + <target name="delete-project" depends="validate-settings" description="Delete the configured user project"> + <echo message="Deleting the entire project in ${project.home}" /> + <delete dir="${project.home}" /> + </target> + + <target name="settings" depends="init-project-properties" description="Print the current project settings"> + <echo message="Java project workspace: ${workspace.home}"/> + <echo message="JBoss home: ${project.jboss.home}"/> + <echo message="JBoss conf: ${project.jboss.conf}"/> + <echo message="Project name: ${project.name}"/> + <echo message="Project type: ${project.type}"/> + </target> + +</project> \ No newline at end of file Property changes on: stack/metro/trunk/src/main/distro/build-project-gen.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/metro/trunk/src/main/distro/build.xml =================================================================== --- stack/metro/trunk/src/main/distro/build.xml 2008-05-19 11:54:59 UTC (rev 7094) +++ stack/metro/trunk/src/main/distro/build.xml 2008-05-19 13:47:01 UTC (rev 7095) @@ -11,7 +11,7 @@  -<project basedir="." name="JBossWS-CXF"> +<project basedir="." name="JBossWS-Metro">   @@ -37,6 +37,7 @@ <import file="${build.dir}/build-deploy.xml"/> <import file="${build.dir}/jbossws-deploy-macros.xml"/> <import file="${tests.dir}/ant-import/build-testsuite.xml"/> + <import file="${build.dir}/build-project-gen.xml"/>   Added: stack/metro/trunk/src/main/distro/user-project-build.xml =================================================================== --- stack/metro/trunk/src/main/distro/user-project-build.xml (rev 0) +++ stack/metro/trunk/src/main/distro/user-project-build.xml 2008-05-19 13:47:01 UTC (rev 7095) @@ -0,0 +1,69 @@ +<?xml version="1.0"?> +<project name="@projectName@" default="deploy" basedir="." > + + <property file="${basedir}/build.properties" /> + <import file="libraries.xml" /> + +  + <property name="project.name" value="@projectName@" /> + <property name="dist.dir" value="dist" /> + <property name="deploy.dir" value="${project.jboss.home}/server/${project.jboss.conf}/deploy" /> + <property name="output.dir" value="output" /> + <property name="src.main.dir" value="src/main/java" /> + <property name="resources.main.dir" value="src/main/resources" /> + <property name="classes.main.dir" value="classes/main/java" /> + <property name="javac.debug" value="true" /> + <property name="javac.deprecation" value="false" /> + + <condition property="project.war" value="true"> + <equals arg1="${project.type}" arg2="war"/> + </condition> + + <target name="clean"> + <delete dir="${output.dir}" /> + <delete dir="${dist.dir}" /> + </target> + + <target name="init"> + <mkdir dir="${output.dir}" /> + <mkdir dir="${dist.dir}" /> + </target> + + <target name="compile" depends="init" description="Compile the Java source code" unless="eclipse.running"> + <tstamp/> + <javac destdir="${output.dir}" classpathref="project.classpath" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on"> + <src path="${src.main.dir}" /> + </javac> + </target> + + <target name="copyclasses" depends="init" description="Copy the classes that were compiled by Eclipse" if="eclipse.running"> + <copy todir="${output.dir}"> + <fileset dir="${classes/main}"> + <include name="**/*.class"/> + </fileset> + </copy> + </target> + + <target name="dist" depends="clean,compile,copyclasses" description="Create the application distribution archive"> + <fail unless="project.type">project.type not set</fail> + <jar jarfile="${dist.dir}/${project.name}.${project.type}"> + <fileset dir="${output.dir}" /> + <fileset dir="${resources.main.dir}"> + <include name="META-INF/**"/> + <include name="WEB-INF/**" if="project.war" /> + </fileset> + </jar> + </target> + + <target name="deploy" depends="dist" description="Deploy to JBoss AS"> + <fail unless="project.jboss.home">project.jboss.home not set</fail> + <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.${project.type}" /> + </target> + + <target name="undeploy" description="Undeploy from JBoss AS"> + <fail unless="project.jboss.home">project.jboss.home not set</fail> + <fail unless="project.jboss.conf">project.jboss.conf not set</fail> + <delete file="${deploy.dir}/${project.name}.${project.type}" /> + </target> + +</project> Property changes on: stack/metro/trunk/src/main/distro/user-project-build.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-19 11:54:59 UTC (rev 7094) +++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-05-19 13:47:01 UTC (rev 7095) @@ -33,6 +33,8 @@ <include>build-setup.xml</include> <include>jbossws-default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> + <include>build-project-gen.xml</include> + <include>user-project-build.xml</include> </includes> </fileSet>  @@ -82,8 +84,12 @@ <unpackOptions> <includes> <include>ant-import/**</include> + <include>java/org/jboss/test/ws/console/**</include> <include>java/org/jboss/test/ws/jaxws/samples/**</include> + <include>java/org/jboss/test/ws/projectGenerator/**</include> + <include>resources/console/**</include> <include>resources/jaxws/samples/**</include> + <include>resources/projectGenerator/**</include> </includes> </unpackOptions> </dependencySet>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7094 - container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-19 07:54:59 -0400 (Mon, 19 May 2008) New Revision: 7094 Modified: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml Log: fixed container beans Modified: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-05-19 11:52:33 UTC (rev 7093) +++ container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-beans.xml 2008-05-19 11:54:59 UTC (rev 7094) @@ -15,41 +15,100 @@ </bean>  - <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.DeploymentAspectHttpServer"/> - -  - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> - -  <bean name="WebserviceJSERuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> - <property name="runtimeName">WebserviceJSERuntime</property> + <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> +  +  + <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + </bean> + +  + <bean name="JSETransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> + <property name="httpTransport"><inject bean="JSEHttpTransport"/></property> + </bean> + +  + <bean name="EJBTransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> + <property name="httpTransport"><inject bean="EJBHttpTransport"/></property> + </bean> + +  + <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> + </bean> + +  + <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> + +  + <bean name="WSWebAppDeploymentFactory" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentFactory"> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + <property name="mainDeployer"><inject bean="MainDeployer"/></property> + </bean> + +  + <bean name="InvocationHandlerFactory" class="org.jboss.wsf.container.jboss50.invocation.InvocationHandlerFactoryImpl"/> +  <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> @@ -58,8 +117,10 @@ </bean>  + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect"> <property name="provides">ContainerMetaData, VFSRoot</property> </bean> @@ -68,9 +129,9 @@ <property name="requires">ContainerMetaData</property> <property name="provides">ContextRoot</property> </bean> - - <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> - <property name="requires">URLPattern</property> + + <bean name="WSHttpTransportDeploymentAspect" class="org.jboss.wsf.framework.deployment.HttpTransportDeploymentAspect"> + <property name="requires">URLPattern,ContextProperties</property> <property name="provides">EndpointAddress</property> </bean> @@ -99,6 +160,7 @@ <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"> @@ -115,38 +177,33 @@ <property name="provides">URLPattern</property> </bean> - <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss50.WebAppDeploymentAspect"> - <property name="requires">WebMetaData, ContextProperties</property> - <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> - <property name="mainDeployer"><inject bean="MainDeployer"/></property> - </bean> - - <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.container.jboss50.WebApp50GeneratorDeploymentAspect"> - <property name="requires">URLPattern</property> - <property name="provides">WebMetaData</property> - <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> - <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> - </bean> - -  +  <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="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss50.DefaultWebAppDesciptorModifierImpl"/> - <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss50.WebXMLRewriterImpl"> - <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> + <bean name="WSWebAppDescriptorModifier" class="org.jboss.wsf.container.jboss50.deployment.tomcat.DefaultWebAppDescriptorModifierImpl"/> + + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss50.deployment.tomcat.WebXMLRewriterImpl"> + <property name="descriptorModifier"><inject bean="WSWebAppDescriptorModifier"/></property> </bean> -  +  -  <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"> + +  <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> - <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSHttpTransportDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> @@ -154,14 +211,13 @@ <inject bean="WSModifyWebMetaDataDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> -  +  <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> @@ -169,16 +225,15 @@ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> - <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSHttpTransportDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> - <inject bean="WSWebAppDeploymentAspect"/> - <inject bean="WSWebAppGeneratorDeploymentAspect"/> </set> </property> </bean> @@ -187,16 +242,14 @@ <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"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSEndpointAPIDeploymentAspect"/> - <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSHttpTransportDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> - <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSWebAppDeploymentAspect"/> - <inject bean="WSWebAppGeneratorDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> </set> </property> </bean>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7093 - container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-19 07:52:33 -0400 (Mon, 19 May 2008) New Revision: 7093 Modified: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml Log: rollback wrong commit - svn merge -r 7091:7090 . Modified: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2008-05-19 11:19:20 UTC (rev 7092) +++ container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2008-05-19 11:52:33 UTC (rev 7093) @@ -4,252 +4,168 @@ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> -  - <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - </bean> - -  - <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> - </bean> - -  - <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.transport.WSFRuntimeDelegateHttpServer"/> -  + Web Service deployment - <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> + There are two deployers registered with the JBoss Main Deployer. + The order of which is important - <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> + 1) EJBDeployer < WebServiceDeployerEJB + 2) WebServiceDeployerPreJSE < WarDeployer + 3) WarDeployer < WebServiceDeployerPostJSE - <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> + Each WebServiceDeployer has a number of DeployerHooks registered with it -  + - WebServiceDeployerEJB + - WSDeployerHook_JAXRPC_EJB21 + - WSDeployerHook_JAXWS_EJB3 -  - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> + - WebServiceDeployerPreJSE + - WSDeployerHook_JAXRPC_JSE + - WSDeployerHook_JAXWS_JSE -  - <bean name="JSETransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> - <property name="httpTransport"><inject bean="JSEHttpTransport"/></property> - </bean> + Conceptually, each of these hooks implements the following pattern: -  - <bean name="EJBTransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> - <property name="httpTransport"><inject bean="EJBHttpTransport"/></property> - </bean> + DeployerHook.deploy(unit) + if(isWebServiceDeployment) + Deployment dep = createDeployment(unit) + DeploymentAspectManager.deploy(dep) -  - <bean name="EndpointAPITransportManagerFactory" class="org.jboss.wsf.container.jboss50.transport.BareTransportManagerFactory"> - <property name="httpTransport"><inject bean="EndpointAPIHttpTransport"/></property> - </bean> + DeployerHook.undeploy(unit) + Deployment dep = getDeployment(unit) + DeploymentAspectManager.undeploy(dep) - <bean name="JSEHttpTransport" class="org.jboss.wsf.container.jboss50.transport.NoopHttpTransportManager"/> + Each deployer hook has a web service DeploymentAspectManager injected into it. + A web service DeploymentAspectManager maintains a list of DeploymentAspects, each of which + handles a single aspect of web service deployment. - <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> + Finally, each Endpoint is registered with the EndpointRegistry. - <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> + ********************************************************************************************************************* + --> -  - <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 name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB"> + <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> + <property name="relOrderEJB3"><inject bean="Ejb3Deployer" property="relativeOrder"/></property> + <depends>EJB2xDeployer</depends> + <depends>Ejb3Deployer</depends> </bean> -  - <bean name="WSWebAppDeploymentFactory" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentFactory"> - <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property> +  + <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"> + <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> + <depends>WebAppParsingDeployer</depends> </bean> - -  - <bean name="InvocationHandlerFactory" class="org.jboss.wsf.container.jboss50.invocation.InvocationHandlerFactoryImpl"/>  - - <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerJSE</property> + <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"> + <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> + <depends>WebAppParsingDeployer</depends> </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> -  - <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect"> - <property name="provides">ContainerMetaData, VFSRoot</property> +  + <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> - - <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">ContextRoot</property> +  + <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="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 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> - <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">ContainerEndpointHandler</property> +  + <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> - - <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> - <property name="requires">LAST_DEPLOYMENT_ASPECT</property> +  + <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="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect"> - <property name="provides">EndpointMetrics</property> + <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> - <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> - -  - <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"/> - -  - - <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"> - -  - <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"/> - -  - <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>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7092 - container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-19 07:19:20 -0400 (Mon, 19 May 2008) New Revision: 7092 Added: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java Removed: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDesciptorModifierImpl.java Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java Log: refactoring - fixed typo Deleted: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDesciptorModifierImpl.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDesciptorModifierImpl.java 2008-05-19 10:40:29 UTC (rev 7091) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDesciptorModifierImpl.java 2008-05-19 11:19:20 UTC (rev 7092) @@ -1,169 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.container.jboss50.deployment.tomcat; - -import java.util.Iterator; -import java.util.Map; - -import org.dom4j.Document; -import org.dom4j.Element; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.transport.HttpSpec; - -/** - * Modifies web.xml for jbossws - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2006 - */ -public class DefaultWebAppDesciptorModifierImpl implements WebAppDescriptorModifier -{ - // logging support - private static Logger log = Logger.getLogger(DefaultWebAppDesciptorModifierImpl.class); - - public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException - { - RewriteResults results = new RewriteResults(); - Element root = webXml.getRootElement(); - - 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> contextParams = (Map<String, String>)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_CONTEXT_PARAMETERS); - if (contextParams != null) - { - for (Map.Entry<String, String> entry : contextParams.entrySet()) - { - // Ugly way to insert at position 0 - Element contextParamTmp = root.addElement("context-param-tmp"); - - Element contextParam = (Element)contextParamTmp.clone(); - contextParam.setName("context-param"); - contextParam.addElement("param-name").addText(entry.getKey()); - contextParam.addElement("param-value").addText(entry.getValue()); - root.content().add(0, contextParam); - - root.remove(contextParamTmp); - } - } - - String listenerClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER); - if (listenerClass != null) - { - Element listener = root.addElement("listener"); - listener.addElement("listener-class").setText(listenerClass); - } - - for (Iterator it = root.elementIterator("servlet"); it.hasNext();) - { - Element servlet = (Element)it.next(); - String linkName = servlet.element("servlet-name").getTextTrim(); - - // find the servlet-class - Element classElement = servlet.element("servlet-class"); - - // JSP - if (classElement == null) - continue; - - String orgServletClassName = classElement.getTextTrim(); - - // 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 (Iterator itParam = servlet.elementIterator("init-param"); itParam.hasNext();) - { - Element elParam = (Element)itParam.next(); - String paramName = elParam.element("param-name").getTextTrim(); - String paramValue = elParam.element("param-value").getTextTrim(); - 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; - } - - classElement.setText(servletClass); - - // add additional init params - if (orgServletClassName.equals(servletClass) == false) - { - targetBeanName = orgServletClassName; - Element paramElement = servlet.addElement("init-param"); - paramElement.addElement("param-name").addText(Endpoint.SEPID_DOMAIN_ENDPOINT); - paramElement.addElement("param-value").addText(targetBeanName); - } - } - - 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(Element servlet) - { - for (Iterator it = servlet.elementIterator("init-param"); it.hasNext();) - { - Element elParam = (Element)it.next(); - String paramName = elParam.element("param-name").getTextTrim(); - if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(paramName)) - return true; - } - return false; - } -} Added: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java (rev 0) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java 2008-05-19 11:19:20 UTC (rev 7092) @@ -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.deployment.tomcat; + +import java.util.Iterator; +import java.util.Map; + +import org.dom4j.Document; +import org.dom4j.Element; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.transport.HttpSpec; + +/** + * Modifies web.xml for jbossws + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2006 + */ +public class DefaultWebAppDescriptorModifierImpl implements WebAppDescriptorModifier +{ + // logging support + private static Logger log = Logger.getLogger(DefaultWebAppDescriptorModifierImpl.class); + + public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException + { + RewriteResults results = new RewriteResults(); + Element root = webXml.getRootElement(); + + 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> contextParams = (Map<String, String>)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_CONTEXT_PARAMETERS); + if (contextParams != null) + { + for (Map.Entry<String, String> entry : contextParams.entrySet()) + { + // Ugly way to insert at position 0 + Element contextParamTmp = root.addElement("context-param-tmp"); + + Element contextParam = (Element)contextParamTmp.clone(); + contextParam.setName("context-param"); + contextParam.addElement("param-name").addText(entry.getKey()); + contextParam.addElement("param-value").addText(entry.getValue()); + root.content().add(0, contextParam); + + root.remove(contextParamTmp); + } + } + + String listenerClass = (String)dep.getProperty(HttpSpec.PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER); + if (listenerClass != null) + { + Element listener = root.addElement("listener"); + listener.addElement("listener-class").setText(listenerClass); + } + + for (Iterator it = root.elementIterator("servlet"); it.hasNext();) + { + Element servlet = (Element)it.next(); + String linkName = servlet.element("servlet-name").getTextTrim(); + + // find the servlet-class + Element classElement = servlet.element("servlet-class"); + + // JSP + if (classElement == null) + continue; + + String orgServletClassName = classElement.getTextTrim(); + + // 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 (Iterator itParam = servlet.elementIterator("init-param"); itParam.hasNext();) + { + Element elParam = (Element)itParam.next(); + String paramName = elParam.element("param-name").getTextTrim(); + String paramValue = elParam.element("param-value").getTextTrim(); + 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; + } + + classElement.setText(servletClass); + + // add additional init params + if (orgServletClassName.equals(servletClass) == false) + { + targetBeanName = orgServletClassName; + Element paramElement = servlet.addElement("init-param"); + paramElement.addElement("param-name").addText(Endpoint.SEPID_DOMAIN_ENDPOINT); + paramElement.addElement("param-value").addText(targetBeanName); + } + } + + 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(Element servlet) + { + for (Iterator it = servlet.elementIterator("init-param"); it.hasNext();) + { + Element elParam = (Element)it.next(); + String paramName = elParam.element("param-name").getTextTrim(); + if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(paramName)) + return true; + } + return false; + } +} Property changes on: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/DefaultWebAppDescriptorModifierImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java 2008-05-19 10:40:29 UTC (rev 7091) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/WebXMLRewriterImpl.java 2008-05-19 11:19:20 UTC (rev 7092) @@ -43,21 +43,21 @@ */ public class WebXMLRewriterImpl { - private WebAppDescriptorModifier desciptorModifier; + private WebAppDescriptorModifier descriptorModifier; public WebXMLRewriterImpl() { - this.desciptorModifier = new DefaultWebAppDesciptorModifierImpl(); + this.descriptorModifier = new DefaultWebAppDescriptorModifierImpl(); } - public WebAppDescriptorModifier getDesciptorModifier() + public WebAppDescriptorModifier getDescriptorModifier() { - return desciptorModifier; + return descriptorModifier; } - public void setDesciptorModifier(WebAppDescriptorModifier desciptorModifier) + public void setDescriptorModifier(WebAppDescriptorModifier descriptorModifier) { - this.desciptorModifier = desciptorModifier; + this.descriptorModifier = descriptorModifier; } public RewriteResults rewriteWebXml(Deployment dep) @@ -110,7 +110,7 @@ SAXReader reader = new SAXReader(); Document document = reader.read(inputStream); - RewriteResults results = desciptorModifier.modifyDescriptor(dep, document); + RewriteResults results = descriptorModifier.modifyDescriptor(dep, document); results.webXML = destFile.toURL(); outputStream = new FileOutputStream(destFile);

16 years, 7 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2008