riftsaw SVN: r1187 - branches/RiftSaw-2.2.x.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-12-05 05:13:03 -0500 (Sun, 05 Dec 2010)
New Revision: 1187
Modified:
branches/RiftSaw-2.2.x/pom.xml
Log:
*RIFTSAW-286, make it maven3 compliant.
Modified: branches/RiftSaw-2.2.x/pom.xml
===================================================================
--- branches/RiftSaw-2.2.x/pom.xml 2010-12-05 09:55:16 UTC (rev 1186)
+++ branches/RiftSaw-2.2.x/pom.xml 2010-12-05 10:13:03 UTC (rev 1187)
@@ -200,6 +200,12 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-utils</artifactId>
<version>${riftsaw.ode.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
14 years
riftsaw SVN: r1186 - in branches/RiftSaw-ODE-2.1.x: axis2 and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-12-05 04:55:16 -0500 (Sun, 05 Dec 2010)
New Revision: 1186
Modified:
branches/RiftSaw-ODE-2.1.x/axis2/pom.xml
branches/RiftSaw-ODE-2.1.x/pom.xml
branches/RiftSaw-ODE-2.1.x/utils/pom.xml
Log:
*RiftSaw-286, remove the woden 1.0-incubating-M7b dependency, it is not maven3 compliant.
Modified: branches/RiftSaw-ODE-2.1.x/axis2/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/axis2/pom.xml 2010-12-05 09:47:55 UTC (rev 1185)
+++ branches/RiftSaw-ODE-2.1.x/axis2/pom.xml 2010-12-05 09:55:16 UTC (rev 1186)
@@ -87,16 +87,34 @@
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
<version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
<version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
<version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
Modified: branches/RiftSaw-ODE-2.1.x/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/pom.xml 2010-12-05 09:47:55 UTC (rev 1185)
+++ branches/RiftSaw-ODE-2.1.x/pom.xml 2010-12-05 09:55:16 UTC (rev 1186)
@@ -901,6 +901,12 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>${axis2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: branches/RiftSaw-ODE-2.1.x/utils/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.1.x/utils/pom.xml 2010-12-05 09:47:55 UTC (rev 1185)
+++ branches/RiftSaw-ODE-2.1.x/utils/pom.xml 2010-12-05 09:55:16 UTC (rev 1186)
@@ -83,6 +83,12 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
14 years
riftsaw SVN: r1185 - in branches/RiftSaw-ODE-2.2.x: axis2 and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-12-05 04:47:55 -0500 (Sun, 05 Dec 2010)
New Revision: 1185
Modified:
branches/RiftSaw-ODE-2.2.x/axis2/pom.xml
branches/RiftSaw-ODE-2.2.x/pom.xml
branches/RiftSaw-ODE-2.2.x/utils/pom.xml
Log:
*RiftSaw-286, remove the woden 1.0-incubating-M7b dependency, it is not maven3 compliant.
Modified: branches/RiftSaw-ODE-2.2.x/axis2/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.2.x/axis2/pom.xml 2010-12-05 09:44:01 UTC (rev 1184)
+++ branches/RiftSaw-ODE-2.2.x/axis2/pom.xml 2010-12-05 09:47:55 UTC (rev 1185)
@@ -87,16 +87,34 @@
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
<version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
<version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
<version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
Modified: branches/RiftSaw-ODE-2.2.x/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.2.x/pom.xml 2010-12-05 09:44:01 UTC (rev 1184)
+++ branches/RiftSaw-ODE-2.2.x/pom.xml 2010-12-05 09:47:55 UTC (rev 1185)
@@ -901,6 +901,12 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>${axis2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: branches/RiftSaw-ODE-2.2.x/utils/pom.xml
===================================================================
--- branches/RiftSaw-ODE-2.2.x/utils/pom.xml 2010-12-05 09:44:01 UTC (rev 1184)
+++ branches/RiftSaw-ODE-2.2.x/utils/pom.xml 2010-12-05 09:47:55 UTC (rev 1185)
@@ -83,6 +83,12 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
14 years
riftsaw SVN: r1184 - in branches/ODE/RiftSaw-ODE-trunk: axis2 and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2010-12-05 04:44:01 -0500 (Sun, 05 Dec 2010)
New Revision: 1184
Modified:
branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml
branches/ODE/RiftSaw-ODE-trunk/pom.xml
branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml
Log:
*RiftSaw-286, remove the woden 1.0-incubating-M7b dependency, it is not maven3 compliant.
Modified: branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml 2010-12-03 18:15:52 UTC (rev 1183)
+++ branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml 2010-12-05 09:44:01 UTC (rev 1184)
@@ -87,16 +87,34 @@
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
<version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
<version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
<version>${rampart.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
Modified: branches/ODE/RiftSaw-ODE-trunk/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/pom.xml 2010-12-03 18:15:52 UTC (rev 1183)
+++ branches/ODE/RiftSaw-ODE-trunk/pom.xml 2010-12-05 09:44:01 UTC (rev 1184)
@@ -901,6 +901,12 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>${axis2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml 2010-12-03 18:15:52 UTC (rev 1183)
+++ branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml 2010-12-05 09:44:01 UTC (rev 1184)
@@ -83,6 +83,12 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
14 years
riftsaw SVN: r1183 - dsp/trunk/samples/deployer.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-12-03 13:15:52 -0500 (Fri, 03 Dec 2010)
New Revision: 1183
Modified:
dsp/trunk/samples/deployer/
Log:
Ignore Eclipse files.
Property changes on: dsp/trunk/samples/deployer
___________________________________________________________________
Name: svn:ignore
- build
target
+ build
target
.classpath
.project
.settings
14 years
riftsaw SVN: r1181 - in dsp/trunk/samples: deployer and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-12-03 12:52:55 -0500 (Fri, 03 Dec 2010)
New Revision: 1181
Removed:
dsp/trunk/samples/deployer/.classpath
dsp/trunk/samples/deployer/.project
Modified:
dsp/trunk/samples/deployer-assembly/
dsp/trunk/samples/deployer/pom.xml
dsp/trunk/samples/pom.xml
Log:
Remove Eclipse artifacts from the sample deployer module and ignore target.
Deleted: dsp/trunk/samples/deployer/.classpath
===================================================================
--- dsp/trunk/samples/deployer/.classpath 2010-12-03 17:51:14 UTC (rev 1180)
+++ dsp/trunk/samples/deployer/.classpath 2010-12-03 17:52:55 UTC (rev 1181)
@@ -1,13 +0,0 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
- <classpathentry kind="src" path="/dsp-api"/>
- <classpathentry kind="src" path="/dsp-jboss"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
\ No newline at end of file
Deleted: dsp/trunk/samples/deployer/.project
===================================================================
--- dsp/trunk/samples/deployer/.project 2010-12-03 17:51:14 UTC (rev 1180)
+++ dsp/trunk/samples/deployer/.project 2010-12-03 17:52:55 UTC (rev 1181)
@@ -1,29 +0,0 @@
-<projectDescription>
- <name>dsp-example-deployer</name>
- <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
- <projects>
- <project>dsp-api</project>
- <project>dsp-jboss</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
Modified: dsp/trunk/samples/deployer/pom.xml
===================================================================
--- dsp/trunk/samples/deployer/pom.xml 2010-12-03 17:51:14 UTC (rev 1180)
+++ dsp/trunk/samples/deployer/pom.xml 2010-12-03 17:52:55 UTC (rev 1181)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.dsp.samples</groupId>
<artifactId>dsp-example-deployer</artifactId>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<version>1.0.0-SNAPSHOT</version>
<name>SOA::DSP::Samples::Deployer</name>
@@ -65,8 +65,4 @@
</dependency>
</dependencies>
- <build>
- <finalName>dsp-example-deployer</finalName>
- </build>
-
</project>
Property changes on: dsp/trunk/samples/deployer-assembly
___________________________________________________________________
Name: svn:ignore
+ target
Modified: dsp/trunk/samples/pom.xml
===================================================================
--- dsp/trunk/samples/pom.xml 2010-12-03 17:51:14 UTC (rev 1180)
+++ dsp/trunk/samples/pom.xml 2010-12-03 17:52:55 UTC (rev 1181)
@@ -16,6 +16,7 @@
<modules>
<module>deployer</module>
+ <module>deployer-assembly</module>
</modules>
</project>
14 years
riftsaw SVN: r1180 - in dsp/trunk/samples: deployer-assembly and 8 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-12-03 12:51:14 -0500 (Fri, 03 Dec 2010)
New Revision: 1180
Added:
dsp/trunk/samples/deployer-assembly/
dsp/trunk/samples/deployer-assembly/pom.xml
dsp/trunk/samples/deployer-assembly/src/
dsp/trunk/samples/deployer-assembly/src/main/
dsp/trunk/samples/deployer-assembly/src/main/assembly/
dsp/trunk/samples/deployer-assembly/src/main/assembly/war.xml
dsp/trunk/samples/deployer-assembly/src/main/resources/
dsp/trunk/samples/deployer-assembly/src/main/resources/META-INF/
dsp/trunk/samples/deployer-assembly/src/main/resources/META-INF/MANIFEST.MF
dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/
dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/classes/
dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/classes/dsp.properties
dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/lib/
dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/web.xml
dsp/trunk/samples/deployer-assembly/src/main/resources/files/
dsp/trunk/samples/deployer-assembly/src/main/resources/files/placeholder.txt
Log:
Add deployer-assembly
Added: dsp/trunk/samples/deployer-assembly/pom.xml
===================================================================
--- dsp/trunk/samples/deployer-assembly/pom.xml (rev 0)
+++ dsp/trunk/samples/deployer-assembly/pom.xml 2010-12-03 17:51:14 UTC (rev 1180)
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.soa.dsp.samples</groupId>
+ <artifactId>dsp-example-deployer-assembly</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>SOA::DSP::Samples::Deployer-Assembly</name>
+
+ <parent>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-api</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jboss</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-tomcat</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp.samples</groupId>
+ <artifactId>dsp-example-deployer</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ <!-- scope>provided</scope -->
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>dsp-example-deployer</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/war.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <archiverConfig>
+ <duplicateBehavior>skip</duplicateBehavior>
+ </archiverConfig>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: dsp/trunk/samples/deployer-assembly/src/main/assembly/war.xml
===================================================================
--- dsp/trunk/samples/deployer-assembly/src/main/assembly/war.xml (rev 0)
+++ dsp/trunk/samples/deployer-assembly/src/main/assembly/war.xml 2010-12-03 17:51:14 UTC (rev 1180)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id>bin</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>war</format>
+ </formats>
+
+ <fileSets>
+
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+
+ </fileSets>
+
+ <dependencySets>
+
+ <dependencySet>
+ <outputDirectory>/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>commons-fileupload:commons-fileupload</include>
+ <include>commons-io:commons-io</include>
+ <include>javassist:javassist</include>
+ <include>wsdl4j:wsdl4j</include>
+ <include>org.jboss.soa.dsp:dsp-api</include>
+ <include>org.jboss.soa.dsp:dsp-jboss</include>
+ <include>org.jboss.soa.dsp:dsp-tomcat</include>
+ <include>org.jboss.soa.dsp.samples:dsp-example-deployer</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
+
+</assembly>
\ No newline at end of file
Added: dsp/trunk/samples/deployer-assembly/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- dsp/trunk/samples/deployer-assembly/src/main/resources/META-INF/MANIFEST.MF (rev 0)
+++ dsp/trunk/samples/deployer-assembly/src/main/resources/META-INF/MANIFEST.MF 2010-12-03 17:51:14 UTC (rev 1180)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/classes/dsp.properties
===================================================================
--- dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/classes/dsp.properties (rev 0)
+++ dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/classes/dsp.properties 2010-12-03 17:51:14 UTC (rev 1180)
@@ -0,0 +1,5 @@
+dsp.server.config.locator = org.jboss.soa.dsp.server.tomcat.TomcatServerConfigLocator
+dsp.service.deployer = org.jboss.soa.dsp.deployer.tomcat.TomcatServiceDeployer
+
+#dsp.server.config.locator = org.jboss.soa.dsp.server.jboss.ServerConfigFactory
+#dsp.service.deployer = org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer
Added: dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/web.xml
===================================================================
--- dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/web.xml (rev 0)
+++ dsp/trunk/samples/deployer-assembly/src/main/resources/WEB-INF/web.xml 2010-12-03 17:51:14 UTC (rev 1180)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+ <display-name>DSPExample</display-name>
+ <welcome-file-list>
+ <welcome-file>WelcomeServlet</welcome-file>
+ </welcome-file-list>
+ <servlet>
+ <description></description>
+ <display-name>WelcomeServlet</display-name>
+ <servlet-name>WelcomeServlet</servlet-name>
+ <servlet-class>org.jboss.soa.dsp.example.WelcomeServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <description></description>
+ <display-name>DeployServlet</display-name>
+ <servlet-name>DeployServlet</servlet-name>
+ <servlet-class>org.jboss.soa.dsp.example.DeployServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <description></description>
+ <display-name>UndeployServlet</display-name>
+ <servlet-name>UndeployServlet</servlet-name>
+ <servlet-class>org.jboss.soa.dsp.example.UndeployServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>WelcomeServlet</servlet-name>
+ <url-pattern>/WelcomeServlet</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>DeployServlet</servlet-name>
+ <url-pattern>/DeployServlet</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>UndeployServlet</servlet-name>
+ <url-pattern>/UndeployServlet</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Added: dsp/trunk/samples/deployer-assembly/src/main/resources/files/placeholder.txt
===================================================================
--- dsp/trunk/samples/deployer-assembly/src/main/resources/files/placeholder.txt (rev 0)
+++ dsp/trunk/samples/deployer-assembly/src/main/resources/files/placeholder.txt 2010-12-03 17:51:14 UTC (rev 1180)
@@ -0,0 +1 @@
+Placeholder to cause 'files' folder to be included in war.
\ No newline at end of file
14 years
riftsaw SVN: r1179 - dsp/trunk/tomcat.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-12-03 12:07:27 -0500 (Fri, 03 Dec 2010)
New Revision: 1179
Modified:
dsp/trunk/tomcat/
Log:
Ignore target folder.
Property changes on: dsp/trunk/tomcat
___________________________________________________________________
Name: svn:ignore
+ target
14 years
riftsaw SVN: r1178 - in dsp/trunk: api/src/main/java/org/jboss/soa/dsp/ws and 16 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2010-12-03 12:06:49 -0500 (Fri, 03 Dec 2010)
New Revision: 1178
Added:
dsp/trunk/samples/deployer/lib/dsp-tomcat-1.0.0-SNAPSHOT.jar
dsp/trunk/tomcat/
dsp/trunk/tomcat/.classpath
dsp/trunk/tomcat/.project
dsp/trunk/tomcat/pom.xml
dsp/trunk/tomcat/src/
dsp/trunk/tomcat/src/main/
dsp/trunk/tomcat/src/main/java/
dsp/trunk/tomcat/src/main/java/org/
dsp/trunk/tomcat/src/main/java/org/jboss/
dsp/trunk/tomcat/src/main/java/org/jboss/soa/
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/deployer/
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/deployer/tomcat/
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/deployer/tomcat/TomcatServiceDeployer.java
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/
dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigLocator.java
Modified:
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java
dsp/trunk/pom.xml
dsp/trunk/samples/deployer/.classpath
dsp/trunk/samples/deployer/.project
dsp/trunk/samples/deployer/lib/dsp-api-1.0.0-SNAPSHOT.jar
dsp/trunk/samples/deployer/lib/dsp-jboss-1.0.0-SNAPSHOT.jar
dsp/trunk/samples/deployer/pom.xml
dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/WSDeployer.java
dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/classes/dsp.properties
Log:
Initial tomcat deployer for the example. Needs plenty of work!
Modified: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java 2010-12-02 14:37:45 UTC (rev 1177)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java 2010-12-03 17:06:49 UTC (rev 1178)
@@ -24,8 +24,6 @@
import javassist.bytecode.annotation.EnumMemberValue;
import javassist.bytecode.annotation.StringMemberValue;
-import javax.xml.namespace.QName;
-
import org.jboss.soa.dsp.EndpointMetaData;
@@ -39,8 +37,10 @@
*/
public class WebServiceProviderGenerator
{
- private final static String PKG_PREFIX = WebServiceProviderGenerator.class.getPackage().getName()+".generated.";
+ private final static String PACKAGE = WebServiceProviderGenerator.class.getPackage().getName()+".generated";
+ private CtClass m_provider=null;
+
public BaseWebServiceEndpoint createProvider(
EndpointMetaData metaData,
WSDLReference wsdlRef,
@@ -60,7 +60,7 @@
CtClass stringType = pool.get("java.lang.String");
- String implClassName = PKG_PREFIX+"WebServiceEndpoint_"+metaData.getEndpointId();
+ String implClassName = PACKAGE+".WebServiceEndpoint_"+metaData.getEndpointId();
//CtClass impl = pool.makeClass(implClassName);
// Load an existing class representing the template for a Web Service provider
@@ -172,7 +172,7 @@
// ------------
// freeze
- impl.stopPruning(false);
+ //impl.stopPruning(false);
impl.toClass(loader);
JavaUtils.clearBlacklists(loader);
@@ -181,9 +181,19 @@
BaseWebServiceEndpoint obj = (BaseWebServiceEndpoint)clazz.newInstance();
+ m_provider = impl;
+
return obj;
}
+
+ public void writeClass(java.io.File war) throws Exception {
+
+ String dir=war.getAbsolutePath()+java.io.File.separatorChar+"WEB-INF"+
+ java.io.File.separatorChar+"classes";
+ m_provider.writeFile(dir);
+ }
+
private void createStringGetter(CtClass impl, CtClass stringType, String property, String methodName)
throws Exception
{
Modified: dsp/trunk/pom.xml
===================================================================
--- dsp/trunk/pom.xml 2010-12-02 14:37:45 UTC (rev 1177)
+++ dsp/trunk/pom.xml 2010-12-03 17:06:49 UTC (rev 1178)
@@ -24,6 +24,7 @@
<modules>
<module>api</module>
<module>jboss</module>
+ <module>tomcat</module>
<module>samples</module>
</modules>
Modified: dsp/trunk/samples/deployer/.classpath
===================================================================
--- dsp/trunk/samples/deployer/.classpath 2010-12-02 14:37:45 UTC (rev 1177)
+++ dsp/trunk/samples/deployer/.classpath 2010-12-03 17:06:49 UTC (rev 1178)
@@ -1,17 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.6.0-openjdk-1.6.0.0">
- <attributes>
- <attribute name="owner.project.facets" value="java"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 5.1 Runtime">
- <attributes>
- <attribute name="owner.project.facets" value="jst.web"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="src" path="/dsp-api"/>
+ <classpathentry kind="src" path="/dsp-jboss"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Modified: dsp/trunk/samples/deployer/.project
===================================================================
--- dsp/trunk/samples/deployer/.project 2010-12-02 14:37:45 UTC (rev 1177)
+++ dsp/trunk/samples/deployer/.project 2010-12-03 17:06:49 UTC (rev 1178)
@@ -1,36 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>dsp-deployer-example</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
+ <name>dsp-example-deployer</name>
+ <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects>
+ <project>dsp-api</project>
+ <project>dsp-jboss</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: dsp/trunk/samples/deployer/lib/dsp-api-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: dsp/trunk/samples/deployer/lib/dsp-jboss-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: dsp/trunk/samples/deployer/lib/dsp-tomcat-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: dsp/trunk/samples/deployer/lib/dsp-tomcat-1.0.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: dsp/trunk/samples/deployer/pom.xml
===================================================================
--- dsp/trunk/samples/deployer/pom.xml 2010-12-02 14:37:45 UTC (rev 1177)
+++ dsp/trunk/samples/deployer/pom.xml 2010-12-03 17:06:49 UTC (rev 1178)
@@ -26,6 +26,11 @@
<version>${dsp.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-tomcat</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.2</version>
@@ -39,8 +44,13 @@
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>${wsdl4j.version}</version>
- <scope>provided</scope>
+ <!-- scope>provided</scope -->
</dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified: dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/WSDeployer.java
===================================================================
--- dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/WSDeployer.java 2010-12-02 14:37:45 UTC (rev 1177)
+++ dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/WSDeployer.java 2010-12-03 17:06:49 UTC (rev 1178)
@@ -53,6 +53,8 @@
* @return The service endpoint reference of the deployed web service
*/
public ServiceEndpointReference deploy(java.io.File root, java.io.File wsdlFile) throws Exception {
+ ServiceEndpointReference ref=null;
+
ClassLoader cl=WSDeployer.class.getClassLoader();
javax.wsdl.factory.WSDLFactory factory=javax.wsdl.factory.WSDLFactory.newInstance();
@@ -74,32 +76,40 @@
port.getName(), new QName("http://www.example.org", "ProcessId"),
UUID.randomUUID().toString());
- BaseWebServiceEndpoint providerImpl =
- providerFactory.createProvider(metaData, wsdlRef, cl,
- null, ExampleWebServiceFactory.class);
+ File warArchive = null;
+ try {
+ BaseWebServiceEndpoint providerImpl =
+ providerFactory.createProvider(metaData, wsdlRef, cl,
+ null, ExampleWebServiceFactory.class);
+
+ _log.info("PROVIDER="+providerImpl);
+
+ ServerConfig serverConfig=getServerConfig();
+
+ warArchive = new DeploymentBuilder(serverConfig)
+ .setEndpoint(metaData.getEndpointId())
+ .setWSDL(wsdlFile, root)
+ .setProvider(providerImpl)
+ .build();
+
+ providerFactory.writeClass(warArchive);
+
+ _log.info("War Archive="+warArchive);
+
+ URL serviceUrl = new WSDLParser(wsdlRef.getDefinition()).getServiceLocationURL(metaData.getServiceName(),
+ metaData.getPortName());
+
+ _log.info("Service URL="+serviceUrl);
+
+ ServiceDeployer deployer=getServiceDeployer();
+
+ ref = deployer.deploy(metaData, providerImpl.getClass(),
+ serviceUrl, cl, warArchive);
- _log.info("PROVIDER="+providerImpl);
-
- ServerConfig serverConfig=getServerConfig();
+ } catch (Throwable t) {
+ _log.log(Level.SEVERE, "Failed", t);
+ }
- File warArchive = new DeploymentBuilder(serverConfig)
- .setEndpoint(metaData.getEndpointId())
- .setWSDL(wsdlFile, root)
- .setProvider(providerImpl)
- .build();
-
- _log.info("War Archive="+warArchive);
-
- URL serviceUrl = new WSDLParser(wsdlRef.getDefinition()).getServiceLocationURL(metaData.getServiceName(),
- metaData.getPortName());
-
- _log.info("Service URL="+serviceUrl);
-
- ServiceDeployer deployer=getServiceDeployer();
-
- ServiceEndpointReference ref=deployer.deploy(metaData, providerImpl.getClass(),
- serviceUrl, cl, warArchive);
-
_log.info("DEPLOYED endpoint ref="+ref);
return(ref);
Modified: dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/classes/dsp.properties
===================================================================
--- dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/classes/dsp.properties 2010-12-02 14:37:45 UTC (rev 1177)
+++ dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/classes/dsp.properties 2010-12-03 17:06:49 UTC (rev 1178)
@@ -1,2 +1,5 @@
-dsp.server.config.locator = org.jboss.soa.dsp.server.jboss.ServerConfigFactory
-dsp.service.deployer = org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer
\ No newline at end of file
+dsp.server.config.locator = org.jboss.soa.dsp.server.tomcat.TomcatServerConfigLocator
+dsp.service.deployer = org.jboss.soa.dsp.deployer.tomcat.TomcatServiceDeployer
+
+#dsp.server.config.locator = org.jboss.soa.dsp.server.jboss.ServerConfigFactory
+#dsp.service.deployer = org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer
Added: dsp/trunk/tomcat/.classpath
===================================================================
--- dsp/trunk/tomcat/.classpath (rev 0)
+++ dsp/trunk/tomcat/.classpath 2010-12-03 17:06:49 UTC (rev 1178)
@@ -0,0 +1,16 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <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/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.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/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.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/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="src" path="/dsp-api"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" sourcepath="M2_REPO/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Added: dsp/trunk/tomcat/.project
===================================================================
--- dsp/trunk/tomcat/.project (rev 0)
+++ dsp/trunk/tomcat/.project 2010-12-03 17:06:49 UTC (rev 1178)
@@ -0,0 +1,15 @@
+<projectDescription>
+ <name>dsp-tomcat</name>
+ <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects>
+ <project>dsp-api</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added: dsp/trunk/tomcat/pom.xml
===================================================================
--- dsp/trunk/tomcat/pom.xml (rev 0)
+++ dsp/trunk/tomcat/pom.xml 2010-12-03 17:06:49 UTC (rev 1178)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-tomcat</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>SOA::DSP::Tomcat</name>
+
+ <parent>
+ <groupId>org.jboss.soa</groupId>
+ <artifactId>dsp</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-api</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+</project>
Added: dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/deployer/tomcat/TomcatServiceDeployer.java
===================================================================
--- dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/deployer/tomcat/TomcatServiceDeployer.java (rev 0)
+++ dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/deployer/tomcat/TomcatServiceDeployer.java 2010-12-03 17:06:49 UTC (rev 1178)
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.deployer.tomcat;
+
+import java.io.File;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import org.jboss.soa.dsp.EndpointMetaData;
+import org.jboss.soa.dsp.ServiceEndpointReference;
+import org.jboss.soa.dsp.deployer.ServiceDeployer;
+
+public class TomcatServiceDeployer implements ServiceDeployer {
+
+ public ServiceEndpointReference deploy(EndpointMetaData metaData,
+ Class<?> providerImpl, URL serviceUrl, ClassLoader classLoader,
+ File deployment) throws Exception {
+
+ String warPath=deployment.getAbsolutePath();
+
+ // Send request to the server
+
+ /* ISSUE: Use of manager requires user authentication. See if there is other way to do this
+ * locally within the server
+ *
+ String path="http://localhost:8080/manager/deploy?path=/Quickstart_bpel_hello_worldWS&...:"+warPath;
+
+ URL url = new URL(path);
+
+ HttpURLConnection con=(HttpURLConnection)url.openConnection();
+
+ con.setDoOutput(true);
+ con.setRequestMethod("GET");
+
+ con.connect();
+
+ System.out.println("CONNECTED TO: "+path+" url="+url);
+ */
+
+ ServiceEndpointReference ret=new ServiceEndpointReference(metaData.getEndpointId(),
+ serviceUrl, metaData.getServiceName().getLocalPart(), warPath);
+
+ return(ret);
+ }
+
+ public void undeploy(ServiceEndpointReference ref) throws Exception {
+
+ }
+}
Added: dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigLocator.java
===================================================================
--- dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigLocator.java (rev 0)
+++ dsp/trunk/tomcat/src/main/java/org/jboss/soa/dsp/server/tomcat/TomcatServerConfigLocator.java 2010-12-03 17:06:49 UTC (rev 1178)
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.server.tomcat;
+
+import java.io.File;
+
+import org.jboss.soa.dsp.server.ServerConfig;
+import org.jboss.soa.dsp.server.ServerConfigLocator;
+
+public class TomcatServerConfigLocator implements ServerConfigLocator {
+
+ public ServerConfig getServerConfig() {
+ ServerConfig ret=new ServerConfig() {
+
+ public String getImplementationTitle() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getImplementationVersion() {
+ return("1.0");
+ }
+
+ public File getServerTempDir() {
+ return(new java.io.File("/tmp"));
+ }
+
+ public File getServerDataDir() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getWebServiceHost() {
+ return("http://localhost");
+ }
+
+ public int getWebServicePort() {
+ return 8080;
+ }
+
+ public int getWebServiceSecurePort() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public String getClusterNodeName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getUddiNodeName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ };
+
+ return(ret);
+ }
+
+}
14 years