[riftsaw-commits] riftsaw SVN: r1157 - in dsp/trunk: api/src/main/resources/META-INF and 7 other directories.

Author: objectiser Date: 2010-11-25 08:01:18 -0500 (Thu, 25 Nov 2010) New Revision: 1157 Added: dsp/trunk/samples/deployer/pom.xml dsp/trunk/samples/deployer/src/main/webapp/ dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-api-1.0.0-SNAPSHOT.jar dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-jboss-1.0.0-SNAPSHOT.jar dsp/trunk/samples/deployer/src/main/webapp/files/placeholder.txt dsp/trunk/samples/pom.xml Removed: dsp/trunk/api/src/main/resources/META-INF/jboss-beans.xml dsp/trunk/samples/deployer/src/main/resources/ dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-1.0.0-SNAPSHOT.jar dsp/trunk/samples/deployer/src/main/webapp/tmp/ Modified: dsp/trunk/pom.xml dsp/trunk/samples/deployer/ dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component Log: Add pom for building war, and other updates to get the war to deploy correctly. Issues at the moment are, (1) fact that commons+dsp jars need to be included in project for use as Eclipse Web Project (deployment to server from Eclipse), and (2) war contains many jars (jboss, javassit, xml, etc) not sure where it is picking these up from. Deleted: dsp/trunk/api/src/main/resources/META-INF/jboss-beans.xml =================================================================== --- dsp/trunk/api/src/main/resources/META-INF/jboss-beans.xml 2010-11-25 10:53:34 UTC (rev 1156) +++ dsp/trunk/api/src/main/resources/META-INF/jboss-beans.xml 2010-11-25 13:01:18 UTC (rev 1157) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- - Locate the single instance of the kernel - --> - <bean name="org.jboss.soa.dsp:service=KernelLocator" - class="org.jboss.soa.dsp.server.jboss.KernelLocator"> - <property name="kernel"> - <inject bean="jboss.kernel:service=Kernel" /> - </property> - </bean> - - <!-- - ServerConfig - --> - <bean name="org.jboss.soa.dsp:service=ServerConfig" - class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl"> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> - <property name="webServiceHost">${jboss.bind.address}</property> - </bean> - - -</deployment> Modified: dsp/trunk/pom.xml =================================================================== --- dsp/trunk/pom.xml 2010-11-25 10:53:34 UTC (rev 1156) +++ dsp/trunk/pom.xml 2010-11-25 13:01:18 UTC (rev 1157) @@ -24,6 +24,7 @@ <modules> <module>api</module> <module>jboss</module> + <module>samples</module> </modules> Property changes on: dsp/trunk/samples/deployer ___________________________________________________________________ Name: svn:ignore + build target Modified: dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component =================================================================== --- dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component 2010-11-25 10:53:34 UTC (rev 1156) +++ dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component 2010-11-25 13:01:18 UTC (rev 1157) @@ -2,7 +2,7 @@ <project-modules id="moduleCoreId" project-version="1.5.0"> <wb-module deploy-name="DSPExample"> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> - <wb-resource deploy-path="/" source-path="/src/main/resources"/> + <wb-resource deploy-path="/" source-path="/src/main/webapp"/> <property name="context-root" value="DSPExample"/> <property name="java-output-path" value="/DSPExample/build/classes"/> </wb-module> Added: dsp/trunk/samples/deployer/pom.xml =================================================================== --- dsp/trunk/samples/deployer/pom.xml (rev 0) +++ dsp/trunk/samples/deployer/pom.xml 2010-11-25 13:01:18 UTC (rev 1157) @@ -0,0 +1,58 @@ +<?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</artifactId> + <packaging>war</packaging> + <version>1.0.0-SNAPSHOT</version> + <name>SOA::DSP::Samples::Deployer</name> + + <parent> + <groupId>org.jboss.soa.dsp</groupId> + <artifactId>samples</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + + <dependencies> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.2</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>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <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> + </dependencies> + + <build> + <finalName>dsp-example-deployer</finalName> + </build> + +</project> Copied: dsp/trunk/samples/deployer/src/main/webapp (from rev 1156, dsp/trunk/samples/deployer/src/main/resources) Deleted: dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-1.0.0-SNAPSHOT.jar =================================================================== (Binary files differ) Added: dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-api-1.0.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-api-1.0.0-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-jboss-1.0.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-jboss-1.0.0-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: dsp/trunk/samples/deployer/src/main/webapp/files/placeholder.txt =================================================================== --- dsp/trunk/samples/deployer/src/main/webapp/files/placeholder.txt (rev 0) +++ dsp/trunk/samples/deployer/src/main/webapp/files/placeholder.txt 2010-11-25 13:01:18 UTC (rev 1157) @@ -0,0 +1 @@ +Placeholder to cause 'files' folder to be included in war. \ No newline at end of file Added: dsp/trunk/samples/pom.xml =================================================================== --- dsp/trunk/samples/pom.xml (rev 0) +++ dsp/trunk/samples/pom.xml 2010-11-25 13:01:18 UTC (rev 1157) @@ -0,0 +1,21 @@ +<?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>samples</artifactId> + <packaging>pom</packaging> + <version>1.0.0-SNAPSHOT</version> + <name>SOA::DSP::Samples</name> + + <parent> + <groupId>org.jboss.soa</groupId> + <artifactId>dsp</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + + <modules> + <module>deployer</module> + </modules> + +</project>