JBossWS SVN: r6484 - stack/native/trunk/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-18 04:20:47 -0400 (Fri, 18 Apr 2008)
New Revision: 6484
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
Log:
[JBWS-2156] allowing users to create SOAP messages with processing instructions - this is required by some SOAP stacks
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2008-04-18 08:00:23 UTC (rev 6483)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2008-04-18 08:20:47 UTC (rev 6484)
@@ -81,7 +81,7 @@
{
soapPart = new SOAPPartImpl(this);
setProperty(CHARACTER_SET_ENCODING, "UTF-8");
- setProperty(WRITE_XML_DECLARATION, false);
+ setProperty(WRITE_XML_DECLARATION, Boolean.valueOf(System.getProperty(WRITE_XML_DECLARATION, "false")));
}
public CIDGenerator getCidGenerator()
16 years, 9 months
JBossWS SVN: r6483 - stack/cxf/branches/tdiesler/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 04:00:23 -0400 (Fri, 18 Apr 2008)
New Revision: 6483
Modified:
stack/cxf/branches/tdiesler/trunk/
Log:
Ignore .settings
Property changes on: stack/cxf/branches/tdiesler/trunk
___________________________________________________________________
Name: svn:ignore
- ant.properties
clipboard.*
target
version.properties.md5
+ ant.properties
clipboard.*
target
version.properties.md5
.settings
16 years, 9 months
JBossWS SVN: r6482 - in stack/cxf/branches/tdiesler/trunk: runtime and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-18 03:57:53 -0400 (Fri, 18 Apr 2008)
New Revision: 6482
Removed:
stack/cxf/branches/tdiesler/trunk/.settings/
Modified:
stack/cxf/branches/tdiesler/trunk/.classpath
stack/cxf/branches/tdiesler/trunk/pom.xml
stack/cxf/branches/tdiesler/trunk/runtime/
Log:
Fix maven eclipse integration
Modified: stack/cxf/branches/tdiesler/trunk/.classpath
===================================================================
--- stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-17 20:57:35 UTC (rev 6481)
+++ stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-18 07:57:53 UTC (rev 6482)
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="runtime/client/target/classes" path="runtime/client/src/main/java"/>
- <classpathentry excluding="**" kind="src" output="runtime/client/src/main/resources" path="runtime/client/src/main/resources"/>
- <classpathentry kind="src" output="runtime/server/target/classes" path="runtime/server/src/main/java"/>
- <classpathentry excluding="**" kind="src" output="runtime/server/src/main/resources/jbossws-cxf-server.jar" path="runtime/server/src/main/resources/jbossws-cxf-server.jar"/>
- <classpathentry excluding="**" kind="src" output="runtime/server/src/main/resources/jbossws-cxf.sar" path="runtime/server/src/main/resources/jbossws-cxf.sar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-17 20:57:35 UTC (rev 6481)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 07:57:53 UTC (rev 6482)
@@ -142,6 +142,57 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jboss422</id>
+ <properties>
+ <jboss.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss.home>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-deployer-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <configuration>
+ <jbossHome>target/test-jboss-home</jbossHome>
+ <layoutDirectory>target/test-layout</layoutDirectory>
+ <layoutResult>target/test-layout/deploy-layout.txt</layoutResult>
+ <keepLayout>true</keepLayout>
+ <!-- relative to jbossHome -->
+ <undeploy>
+ <include>../test-classes/deploy-jboss-pom.xml</include>
+ <include>../test-classes/bogus</include>
+ </undeploy>
+ <deployments>
+ <deployment>
+ <targetDir>bin</targetDir>
+ <sourceDir>src/main/java</sourceDir>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </deployment>
+ </deployments>
+ <!--
+ does not work from test case
+ http://svn.apache.org/viewvc/maven/plugins/tags/maven-plugins-10/maven-de...
+
+ <dependencies>
+ <deployment>
+ <targetDir>libs</targetDir>
+ <includes>
+ <include>commons-validator</include>
+ </includes>
+ </deployment>
+ </dependencies>
+ -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<!-- Repositories -->
<repositories>
<repository>
Property changes on: stack/cxf/branches/tdiesler/trunk/runtime
___________________________________________________________________
Name: svn:ignore
+ target
16 years, 9 months
JBossWS SVN: r6481 - framework/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-17 16:57:35 -0400 (Thu, 17 Apr 2008)
New Revision: 6481
Modified:
framework/trunk/.project
Log:
rename
Modified: framework/trunk/.project
===================================================================
--- framework/trunk/.project 2008-04-17 20:55:39 UTC (rev 6480)
+++ framework/trunk/.project 2008-04-17 20:57:35 UTC (rev 6481)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbossws-framework-parent</name>
+ <name>jbossws-framework</name>
<comment></comment>
<projects>
</projects>
16 years, 9 months
JBossWS SVN: r6480 - in framework/trunk: .settings and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-17 16:55:39 -0400 (Thu, 17 Apr 2008)
New Revision: 6480
Added:
framework/trunk/.settings/
framework/trunk/.settings/org.eclipse.jdt.core.prefs
framework/trunk/.settings/org.maven.ide.eclipse.prefs
Modified:
framework/trunk/.classpath
framework/trunk/.project
Log:
Add maven eclipse integration
Modified: framework/trunk/.classpath
===================================================================
--- framework/trunk/.classpath 2008-04-17 20:44:52 UTC (rev 6479)
+++ framework/trunk/.classpath 2008-04-17 20:55:39 UTC (rev 6480)
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="framework/src/main/java"/>
+ <classpathentry kind="src" output="framework/target/classes" path="framework/src/main/java"/>
+ <classpathentry kind="src" output="framework/target/test-classes" path="framework/src/test/java">
+ <attributes>
+ <attribute name="maven.type" value="test"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="framework/src/main/etc" path="framework/src/main/etc"/>
+ <classpathentry excluding="**" kind="src" output="framework/src/test/resources" path="framework/src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/jaxrpc-api/1.1/jaxrpc-api-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR7/jbossxb-2.0.0.CR7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/3.0.0-SNAPSHOT/jbossws-spi-3.0.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR8/jbossxb-2.0.0.CR8.jar"/>
- <classpathentry kind="output" path="framework/target/eclipse"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: framework/trunk/.project
===================================================================
--- framework/trunk/.project 2008-04-17 20:44:52 UTC (rev 6479)
+++ framework/trunk/.project 2008-04-17 20:55:39 UTC (rev 6480)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>framework</name>
+ <name>jbossws-framework-parent</name>
<comment></comment>
<projects>
</projects>
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Added: framework/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- framework/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ framework/trunk/.settings/org.eclipse.jdt.core.prefs 2008-04-17 20:55:39 UTC (rev 6480)
@@ -0,0 +1,3 @@
+#Thu Apr 17 22:53:35 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=ignore
Added: framework/trunk/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- framework/trunk/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ framework/trunk/.settings/org.maven.ide.eclipse.prefs 2008-04-17 20:55:39 UTC (rev 6480)
@@ -0,0 +1,9 @@
+#Thu Apr 17 22:53:33 CEST 2008
+activeProfiles=
+eclipse.preferences.version=1
+filterResources=false
+includeModules=true
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+useMavenFolders=true
+version=1
16 years, 9 months
JBossWS SVN: r6479 - in stack/cxf/branches/tdiesler/trunk: .settings and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-17 16:44:52 -0400 (Thu, 17 Apr 2008)
New Revision: 6479
Added:
stack/cxf/branches/tdiesler/trunk/.settings/
stack/cxf/branches/tdiesler/trunk/.settings/org.eclipse.jdt.core.prefs
stack/cxf/branches/tdiesler/trunk/.settings/org.maven.ide.eclipse.prefs
Modified:
stack/cxf/branches/tdiesler/trunk/.classpath
stack/cxf/branches/tdiesler/trunk/.project
Log:
Add maven eclipse integration
Modified: stack/cxf/branches/tdiesler/trunk/.classpath
===================================================================
--- stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-17 19:42:15 UTC (rev 6478)
+++ stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-17 20:44:52 UTC (rev 6479)
@@ -1,26 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="runtime/server/src/main/java"/>
- <classpathentry kind="src" path="testsuite/src/test/java"/>
- <classpathentry kind="src" path="runtime/client/src/main/java"/>
+ <classpathentry kind="src" output="runtime/client/target/classes" path="runtime/client/src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="runtime/client/src/main/resources" path="runtime/client/src/main/resources"/>
+ <classpathentry kind="src" output="runtime/server/target/classes" path="runtime/server/src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="runtime/server/src/main/resources/jbossws-cxf-server.jar" path="runtime/server/src/main/resources/jbossws-cxf-server.jar"/>
+ <classpathentry excluding="**" kind="src" output="runtime/server/src/main/resources/jbossws-cxf.sar" path="runtime/server/src/main/resources/jbossws-cxf.sar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.0.5-incubator/cxf-rt-transports-http-2.0.5-incubator.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.0.5-incubator/cxf-rt-frontend-jaxws-2.0.5-incubator.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/3.0.0-SNAPSHOT/jbossws-spi-3.0.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT.jar" sourcepath="/M2_REPO/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.0.5-incubator/cxf-api-2.0.5-incubator.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.0.5-incubator/cxf-rt-core-2.0.5-incubator.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0.8/spring-context-2.0.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0.8/spring-beans-2.0.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.0.8/spring-core-2.0.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-common-utilities/2.0.5-incubator/cxf-common-utilities-2.0.5-incubator.jar"/>
- <classpathentry kind="output" path="target/eclipse"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: stack/cxf/branches/tdiesler/trunk/.project
===================================================================
--- stack/cxf/branches/tdiesler/trunk/.project 2008-04-17 19:42:15 UTC (rev 6478)
+++ stack/cxf/branches/tdiesler/trunk/.project 2008-04-17 20:44:52 UTC (rev 6479)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>stack-cxf</name>
+ <name>jbossws-cxf</name>
<comment></comment>
<projects>
</projects>
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Added: stack/cxf/branches/tdiesler/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- stack/cxf/branches/tdiesler/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/.settings/org.eclipse.jdt.core.prefs 2008-04-17 20:44:52 UTC (rev 6479)
@@ -0,0 +1,3 @@
+#Thu Apr 17 22:39:28 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=ignore
Added: stack/cxf/branches/tdiesler/trunk/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- stack/cxf/branches/tdiesler/trunk/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/.settings/org.maven.ide.eclipse.prefs 2008-04-17 20:44:52 UTC (rev 6479)
@@ -0,0 +1,9 @@
+#Thu Apr 17 22:39:19 CEST 2008
+activeProfiles=
+eclipse.preferences.version=1
+filterResources=false
+includeModules=true
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+useMavenFolders=true
+version=1
16 years, 9 months
JBossWS SVN: r6478 - stack/native/trunk/src/test/java/org/jboss/test/ws/embedded.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-17 15:42:15 -0400 (Thu, 17 Apr 2008)
New Revision: 6478
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java
Log:
Use WSFRuntime interface
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java 2008-04-17 19:40:09 UTC (rev 6477)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java 2008-04-17 19:42:15 UTC (rev 6478)
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.stack.jbws.embedded.DeploymentModelBuilder;
import org.jboss.wsf.stack.jbws.embedded.EmbeddableWSFRuntime;
@@ -55,7 +56,7 @@
.build();
// Publish
- EmbeddableWSFRuntime container = EmbeddableWSFRuntime.bootstrap( EmbeddableWSFRuntime.DEFAULT_CONFIG_URL);
+ WSFRuntime container = EmbeddableWSFRuntime.bootstrap( EmbeddableWSFRuntime.DEFAULT_CONFIG_URL);
container.create(dep);
container.start(dep);
16 years, 9 months
JBossWS SVN: r6477 - in stack/native/trunk: src/main/java/org/jboss/wsf/stack/jbws/embedded and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-17 15:40:09 -0400 (Thu, 17 Apr 2008)
New Revision: 6477
Added:
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/DeploymentModelBuilder.java
Modified:
stack/native/trunk/build.xml
stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java
Log:
Simplify embedded use by providing a DeploymentModelBuilder
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-04-17 18:54:38 UTC (rev 6476)
+++ stack/native/trunk/build.xml 2008-04-17 19:40:09 UTC (rev 6477)
@@ -185,19 +185,6 @@
</copy>
</target>
- <!--target name="clean-42x-resources">
- <delete dir="${core.output.dir}/resources"/>
- <mkdir dir="${core.output.dir}/resources"/>
- </target>
-
- <target name="unzip-jboss422-resources" depends="clean-42x-resources" if="jbossws.integration.jboss422">
- <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss422-resources.zip" overwrite="true"/>
- </target>
-
- <target name="unzip-jboss423-resources" depends="clean-42x-resources" if="jbossws.integration.jboss423">
- <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss422-resources.zip" overwrite="true"/>
- </target-->
-
<!-- Compile resource files -->
<target name="compile42-resources" if="jbossws.integration.jboss42">
<mkdir dir="${core.output.resources.dir}"/>
Added: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/DeploymentModelBuilder.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/DeploymentModelBuilder.java (rev 0)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/DeploymentModelBuilder.java 2008-04-17 19:40:09 UTC (rev 6477)
@@ -0,0 +1,106 @@
+/*
+ * 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.stack.jbws.embedded;
+
+import org.jboss.wsf.spi.deployment.*;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.common.ResourceLoaderAdapter;
+
+import java.util.UUID;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * A builder that helps creating {@link org.jboss.wsf.spi.deployment.Deployment}'s
+ * for embedded use.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class DeploymentModelBuilder
+{
+ private Deployment deployment;
+ private DeploymentModelFactory modelFactory;
+
+ public DeploymentModelBuilder()
+ {
+ SPIProvider spi = SPIProviderResolver.getInstance().getProvider();
+ modelFactory = spi.getSPI(DeploymentModelFactory.class);
+
+ // Deployment
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ this.deployment = modelFactory.newDeployment(UUID.randomUUID().toString(), contextClassLoader);
+ this.deployment.setRuntimeClassLoader(contextClassLoader);
+
+ // TODO: Hack, should this become another DeploymentAspect?
+ ((ArchiveDeployment)this.deployment).setRootFile(new ResourceLoaderAdapter());
+
+ this.deployment.setType(Deployment.DeploymentType.JAXWS_JSE);
+
+ // Service
+ this.deployment.setService(modelFactory.newService());
+
+ }
+
+ public DeploymentModelBuilder setContextRoot(String contextRoot)
+ {
+ assert contextRoot!=null;
+ this.deployment.getService().setContextRoot(contextRoot);
+ return this;
+ }
+
+ public DeploymentModelBuilder addEndpoint(String className, String urlPattern)
+ {
+ assert className!=null;
+ assert urlPattern!=null;
+
+ // Endpoint
+ Endpoint endpoint = modelFactory.newEndpoint("org.jboss.test.ws.embedded.HelloWorldEndpoint");
+ endpoint.setShortName(className + "-Endpoint");
+ endpoint.setURLPattern(urlPattern);
+ this.deployment.getService().addEndpoint(endpoint);
+ return this;
+ }
+
+ public Deployment build()
+ {
+ if(null == this.deployment.getService().getContextRoot())
+ throw new IllegalArgumentException("No context root");
+
+ List<String> usedPatterns = new ArrayList<String>();
+ for(Endpoint ep : this.deployment.getService().getEndpoints())
+ {
+ String urlPattern = ep.getURLPattern();
+ if(null == urlPattern)
+ throw new IllegalArgumentException("No urlPattern");
+
+ for(String usedPattern : usedPatterns)
+ {
+ if(urlPattern.equals(usedPattern))
+ throw new IllegalArgumentException("URL pattern already used: " + urlPattern);
+ }
+
+ usedPatterns.add(urlPattern);
+ }
+ return this.deployment;
+ }
+}
Property changes on: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/embedded/DeploymentModelBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java 2008-04-17 18:54:38 UTC (rev 6476)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java 2008-04-17 19:40:09 UTC (rev 6477)
@@ -22,13 +22,8 @@
package org.jboss.test.ws.embedded;
import junit.framework.TestCase;
-import org.jboss.wsf.common.ResourceLoaderAdapter;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
-import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.stack.jbws.embedded.DeploymentModelBuilder;
import org.jboss.wsf.stack.jbws.embedded.EmbeddableWSFRuntime;
import javax.xml.namespace.QName;
@@ -53,30 +48,12 @@
* @throws Exception
*/
public void testEmbeddedContainer() throws Exception
- {
- SPIProvider spi = SPIProviderResolver.getInstance().getProvider();
- DeploymentModelFactory modelFactory = spi.getSPI(DeploymentModelFactory.class);
+ {
+ Deployment dep = new DeploymentModelBuilder()
+ .setContextRoot("/hello")
+ .addEndpoint("org.jboss.test.ws.embedded.HelloWorldEndpoint", "/endpoint")
+ .build();
- // Deployment
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- Deployment dep = modelFactory.newDeployment("HelloWorldDeployment", contextClassLoader);
- dep.setRuntimeClassLoader(contextClassLoader);
-
- // TODO: Hack, should this become another DeploymentAspect?
- ((ArchiveDeployment)dep).setRootFile(new ResourceLoaderAdapter());
-
- dep.setType(Deployment.DeploymentType.JAXWS_JSE);
- dep.setService(modelFactory.newService());
-
- // Service
- dep.getService().setContextRoot("/hello");
-
- // Endpoint
- Endpoint endpoint = modelFactory.newEndpoint("org.jboss.test.ws.embedded.HelloWorldEndpoint");
- endpoint.setShortName("hello");
- endpoint.setURLPattern("/endpoint");
- dep.getService().addEndpoint(endpoint);
-
// Publish
EmbeddableWSFRuntime container = EmbeddableWSFRuntime.bootstrap( EmbeddableWSFRuntime.DEFAULT_CONFIG_URL);
container.create(dep);
16 years, 9 months
JBossWS SVN: r6476 - in common/trunk: .settings and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-17 14:54:38 -0400 (Thu, 17 Apr 2008)
New Revision: 6476
Added:
common/trunk/.settings/
common/trunk/.settings/org.eclipse.jdt.core.prefs
common/trunk/.settings/org.maven.ide.eclipse.prefs
Modified:
common/trunk/.classpath
common/trunk/.project
Log:
Add maven eclipse integration
Modified: common/trunk/.classpath
===================================================================
--- common/trunk/.classpath 2008-04-17 18:53:32 UTC (rev 6475)
+++ common/trunk/.classpath 2008-04-17 18:54:38 UTC (rev 6476)
@@ -1,16 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="src/main/etc" path="src/main/etc"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
- <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta11/jboss-kernel-2.0.0.Beta11.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta11/jboss-dependency-2.0.0.Beta11.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.5.GA/jboss-common-core-2.2.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/>
- <classpathentry kind="output" path="target/eclipse"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: common/trunk/.project
===================================================================
--- common/trunk/.project 2008-04-17 18:53:32 UTC (rev 6475)
+++ common/trunk/.project 2008-04-17 18:54:38 UTC (rev 6476)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>common</name>
+ <name>jbossws-common</name>
<comment></comment>
<projects>
</projects>
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Added: common/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- common/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ common/trunk/.settings/org.eclipse.jdt.core.prefs 2008-04-17 18:54:38 UTC (rev 6476)
@@ -0,0 +1,3 @@
+#Thu Apr 17 20:52:00 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=ignore
Added: common/trunk/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- common/trunk/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ common/trunk/.settings/org.maven.ide.eclipse.prefs 2008-04-17 18:54:38 UTC (rev 6476)
@@ -0,0 +1,9 @@
+#Thu Apr 17 20:51:59 CEST 2008
+activeProfiles=
+eclipse.preferences.version=1
+filterResources=false
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+useMavenFolders=true
+version=1
16 years, 9 months
JBossWS SVN: r6475 - in stack/metro/trunk: ant-import and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-17 14:53:32 -0400 (Thu, 17 Apr 2008)
New Revision: 6475
Modified:
stack/metro/trunk/ant-import/build-prepare-deploy.xml
stack/metro/trunk/ant-import/build-setup.xml
stack/metro/trunk/ant-import/build-thirdparty.xml
stack/metro/trunk/ant-import/jbossws-deploy-macros.xml
stack/metro/trunk/build.xml
stack/metro/trunk/metro-trunk.iml
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
stack/metro/trunk/src/main/resources/jbossws-metro-config.xml
stack/metro/trunk/version.properties
Log:
Moving to SPI 3 Milestone 1
Modified: stack/metro/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-04-17 18:12:18 UTC (rev 6474)
+++ stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-04-17 18:53:32 UTC (rev 6475)
@@ -30,6 +30,9 @@
<patternset refid="jbossws.server.lib.patternset"/>
<patternset refid="jbossws.service.lib.patternset"/>
<include name="juddi-service.sar"/>
+ <include name="jbossws-jboss50-container.jar"/>
+ <include name="jbossws-jboss42.jar"/>
+ <include name="jbossws-jboss50.jar"/>
</fileset>
<fileset dir="${metro.output.lib.dir}">
<patternset refid="jbossws.client.patternset"/>
@@ -46,6 +49,7 @@
<include name="jbossws-metro50-beans.xml"/>
<include name="jbossws-jboss42.sar/**"/>
<include name="jbossws-metro.sar/**"/>
+ <include name="jbossws-deployer-beans.xml"/>
</fileset>
</copy>
</target>
Modified: stack/metro/trunk/ant-import/build-setup.xml
===================================================================
--- stack/metro/trunk/ant-import/build-setup.xml 2008-04-17 18:12:18 UTC (rev 6474)
+++ stack/metro/trunk/ant-import/build-setup.xml 2008-04-17 18:53:32 UTC (rev 6475)
@@ -61,7 +61,28 @@
<available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
-
+
+ <condition property="jbossws.integration.jboss421" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
+ </condition>
+
+ <condition property="jbossws.integration.jboss422" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ </condition>
+
+ <condition property="jbossws.integration.jboss423" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </condition>
+
+ <condition property="jbossws.integration.jboss500" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ </condition>
+
+ <condition property="jbossws.integration.jboss501" value="true">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </condition>
+
+
<condition property="jbossws.integration.jboss42" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-17 18:12:18 UTC (rev 6474)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-17 18:53:32 UTC (rev 6475)
@@ -51,14 +51,37 @@
<!--
thirdpartry-get
-->
- <target name="thirdparty-get" depends="thirdparty-delete" if="force.thirdparty.get" description="Gets the thirdparty libraries">
+
+ <target name="get422-jars" if="jbossws.integration.jboss422">
+ <mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
+ </target>
+
+ <target name="get423-jars" if="jbossws.integration.jboss423">
+ <mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
+ </target>
+
+ <target name="get501-jars" if="jbossws.integration.jboss501">
+ <mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-src.zip" dest="${thirdparty.dir}/jbossws-jboss50-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-container.jar" dest="${thirdparty.dir}/jbossws-jboss50-container.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-deployer-resources.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" usetimestamp="true" verbose="true"/>
+ </target>
+
+ <target name="thirdparty-get" depends="thirdparty-delete, get422-jars, get423-jars, get501-jars"
+ if="force.thirdparty.get" 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-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-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.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}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
Modified: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-17 18:12:18 UTC (rev 6474)
+++ stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-17 18:53:32 UTC (rev 6475)
@@ -152,7 +152,48 @@
</copy>
</sequential>
</macrodef>
-
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deployers -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deployers50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-deployer-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deploy -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deploy50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-jboss50-container.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
@@ -186,7 +227,20 @@
</copy>
</sequential>
</macrodef>
-
+
+ <macrodef name="macro-deploy-jbossws-client42">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
@@ -203,7 +257,21 @@
</copy>
</sequential>
</macrodef>
-
+
+ <macrodef name="macro-deploy-jbossws-server-lib42">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+
<!-- ================================================================== -->
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
@@ -274,16 +342,20 @@
<available classname="java.io.Console" property="HAVE_JDK_1.6"/>
<target name="deploy-jbossws-metro42" depends="deploy-jbossws-endorsed">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-metro42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/>
</target>
<target name="deploy-jbossws-metro50" depends="deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-metro50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/>
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-04-17 18:12:18 UTC (rev 6474)
+++ stack/metro/trunk/build.xml 2008-04-17 18:53:32 UTC (rev 6475)
@@ -99,33 +99,44 @@
</target>
<!-- Compile resource files -->
- <target name="compile-resources" depends="init">
-
- <!-- Concat jbossws-metro50-beans.xml -->
- <mkdir dir="${metro.output.resources.dir}"/>
- <concat destfile="${metro.output.resources.dir}/jbossws-metro50-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0">
- </header>
- <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- <!-- Concat jboss-beans.xml -->
- <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
- <concat destfile="${metro.output.resources.dir}/jbossws-metro42-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
- </header>
- <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${metro.output.resources.dir}/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
+
+ <!-- Compile resource files -->
+ <target name="compile42-resources" if="jbossws.integration.jboss42">
+ <mkdir dir="${metro.output.resources.dir}"/>
+ <!-- Concat jboss-beans.xml -->
+ <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
+ <concat destfile="${metro.output.resources.dir}/jbossws-metro42-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
+ </header>
+ <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/>
+ <fileset file="${metro.output.resources.dir}/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment>
+ </footer>
+ </concat>
+
+ </target>
+
+
+ <target name="compile50-resources" if="jbossws.integration.jboss50">
+ <mkdir dir="${metro.output.resources.dir}"/>
+ <unzip src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" dest="${metro.output.resources.dir}"/>
+
+ <!-- Concat jbossws-native50-beans.xml -->
+ <concat destfile="${metro.output.resources.dir}/jbossws-metro50-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0">
+ </header>
+ <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/>
+ <footer trimleading="yes">
+ </deployment>
+ </footer>
+ </concat>
+ </target>
+
+ <target name="compile-resources" depends="init, compile42-resources, compile50-resources">
+
<copy todir="${metro.output.resources.dir}">
<fileset dir="${metro.resources.dir}">
<include name="jbossws-metro.jar/**"/>
Modified: stack/metro/trunk/metro-trunk.iml
===================================================================
--- stack/metro/trunk/metro-trunk.iml 2008-04-17 18:12:18 UTC (rev 6474)
+++ stack/metro/trunk/metro-trunk.iml 2008-04-17 18:53:32 UTC (rev 6475)
@@ -32,15 +32,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jaxws-ri-src.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$MODULE_DIR$/thirdparty/sjsxp.jar!/" />
</CLASSES>
<JAVADOC />
@@ -68,15 +59,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" />
</CLASSES>
<JAVADOC />
@@ -257,15 +239,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$MODULE_DIR$/thirdparty/http.jar!/" />
</CLASSES>
<JAVADOC />
@@ -275,21 +248,14 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../framework/trunk/thirdparty/dom4j.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="framework" />
+ <orderEntry type="module" module-name="spi" />
<orderEntryProperties />
</component>
</module>
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-04-17 18:12:18 UTC (rev 6474)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-04-17 18:53:32 UTC (rev 6475)
@@ -26,6 +26,7 @@
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.WSFRuntime;
import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoint;
import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoints;
import org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect;
@@ -44,7 +45,7 @@
public class SunJaxwsDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void create(Deployment dep, WSFRuntime runtime)
{
DDEndpoints dd = dep.getAttachment(DDEndpoints.class);
@@ -87,7 +88,7 @@
}
@Override
- public void destroy(Deployment dep)
+ public void destroy(Deployment dep, WSFRuntime runtime)
{
DDEndpoints dd = dep.getAttachment(DDEndpoints.class);
if (dd != null)
Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
===================================================================
--- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-04-17 18:12:18 UTC (rev 6474)
+++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-04-17 18:53:32 UTC (rev 6475)
@@ -34,6 +34,7 @@
import org.jboss.logging.Logger;
import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.deployment.*;
+import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt;
import org.jboss.wsf.stack.metro.DeploymentDescriptorParserJBWS;
import org.jboss.wsf.stack.metro.FakeServletContext;
@@ -72,7 +73,7 @@
public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url";
- public void create(Deployment deployment)
+ public void start(Deployment deployment, WSFRuntime runtime)
{
ClassLoader runtimeLoader = deployment.getRuntimeClassLoader();
if(null == runtimeLoader)
Modified: stack/metro/trunk/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/trunk/src/main/resources/jbossws-metro-config.xml 2008-04-17 18:12:18 UTC (rev 6474)
+++ stack/metro/trunk/src/main/resources/jbossws-metro-config.xml 2008-04-17 18:53:32 UTC (rev 6475)
@@ -23,11 +23,6 @@
<property name="webServicePort">8080</property>
-->
</bean>
-
- <!-- 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>
<!-- Logging redirector -->
<bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
@@ -46,7 +41,8 @@
<bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
<property name="recording">false</property>
</bean>
-
+
+ <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.metro.RequestHandlerFactoryImpl"/>
<!--
The stack specific deployment aspects
-->
@@ -86,44 +82,35 @@
<property name="provides">RuntimeModel</property>
</bean>
<!-- Deployment aspect installers -->
-
- <!-- Phase 1 -->
- <bean name="WSMetroDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+
+ <bean name="WSMetroDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSMetroContextPropertiesDeploymentAspect"/>
<inject bean="WSMetroDescriptorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerPreJSE</depends>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSMetroDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <!-- phase 2 -->
<inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
<inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
<inject bean="WSRuntimeModelDeploymentAspect"/>
</set>
</property>
- <depends>WSDeploymentAspectInstallerPostJSE</depends>
+ <depends>WSDeploymentAspectInstallerJSE</depends>
</bean>
+
<bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- <inject bean="WSRuntimeModelDeploymentAspect"/>
+ <inject bean="WSMetroDescriptorDeploymentAspect"/>
+ <!-- phase 2 -->
+ <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSRuntimeModelDeploymentAspect"/>
</set>
</property>
<depends>WSDeploymentAspectInstallerEJB</depends>
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2008-04-17 18:12:18 UTC (rev 6474)
+++ stack/metro/trunk/version.properties 2008-04-17 18:53:32 UTC (rev 6475)
@@ -13,12 +13,15 @@
implementation.vendor=JBoss Inc.
implementation.vendor.id=http://www.jboss.org
-# Thirdparty library versions
-jbossws-spi=1.0.2.GA
+# Dependend integration projects
+jbossws-spi=3.0.0-SNAPSHOT
jbossws-common=snapshot
-jbossws-framework=snapshot
-jbossws-jboss42=4.2.1.GA
+jbossws-framework=3.0.2-SNAPSHOT
+jbossws-jboss422=4.2.2.DEV
+jbossws-jboss423=4.2.3.DEV
+jbossws-jboss501=5.0.1.DEV
+
junit=3.8.1
jboss-common-core=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
16 years, 9 months