[riftsaw-commits] riftsaw SVN: r451 - in branches/ODE/ODE-2.0-maven: axis2-war and 4 other directories.

Author: jeff.yuchang Date: 2010-01-11 04:12:13 -0500 (Mon, 11 Jan 2010) New Revision: 451 Modified: branches/ODE/ODE-2.0-maven/axis2-war/pom.xml branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml branches/ODE/ODE-2.0-maven/jbi/pom.xml branches/ODE/ODE-2.0-maven/pom.xml Log: * add maven-jetty-plugin for axis2-war module. Modified: branches/ODE/ODE-2.0-maven/axis2-war/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/axis2-war/pom.xml 2010-01-09 15:03:33 UTC (rev 450) +++ branches/ODE/ODE-2.0-maven/axis2-war/pom.xml 2010-01-11 09:12:13 UTC (rev 451) @@ -40,6 +40,8 @@ <opensaml.version>1.1</opensaml.version> <bouncycastle.version>140</bouncycastle.version> <geronimo-spec-jms.version>1.1-rc4</geronimo-spec-jms.version> + <jetty.version>6.1.3</jetty.version> + <testng.version>5.8</testng.version> </properties> <dependencies> @@ -202,10 +204,30 @@ <version>${mex.version}</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${testng.version}</version> + <classifier>jdk15</classifier> + <scope>test</scope> </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + <version>${jetty.version}</version> + <scope>test</scope> + </dependency> </dependencies> @@ -232,6 +254,69 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.10</version> + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <stopKey>foo</stopKey> + <stopPort>9999</stopPort> + <webApp>${basedir}/target/ode-axis2-war-${project.version}.war</webApp> + </configuration> + <executions> + <execution> + <id>start-jetty</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run-war</goal> + </goals> + <configuration> + <scanIntervalSeconds>0</scanIntervalSeconds> + <daemon>true</daemon> + </configuration> + </execution> + <execution> + <id>stop-jetty</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>compiler-it</id> + <phase>pre-integration-test</phase> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- FIXME: temporary commented out --> + <!--plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*Test.java</include> + <include>**/Test*.java</include> + </includes> + </configuration> + <executions> + <execution> + <id>test-axis2-web</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + </plugin--> </plugins> </build> Modified: branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml =================================================================== --- branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml 2010-01-09 15:03:33 UTC (rev 450) +++ branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml 2010-01-11 09:12:13 UTC (rev 451) @@ -110,7 +110,9 @@ <include>commons-dbcp:commons-dbcp</include> <include>commons-lang:commons-lang</include> <include>commons-pool:commons-pool</include> - <include>commons-io:commons-io</include> + <include>commons-io:commons-io</include> + <include>commons-httpclient:commons-httpclient</include> + <include>commons-logging:commons-logging</include> <include>commons-fileupload:commons-fileupload</include> <include>org.apache.derby:derby</include> <include>org.apache.derby:derbytools</include> Modified: branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml 2010-01-09 15:03:33 UTC (rev 450) +++ branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml 2010-01-11 09:12:13 UTC (rev 451) @@ -23,7 +23,6 @@ <groupId>org.apache.ode</groupId> <artifactId>ode-dao-hibernate-db</artifactId> <name>ODE :: Hibernate DAO DDL Generation</name> - <packaging>pom</packaging> <parent> <groupId>org.apache.ode</groupId> Modified: branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml 2010-01-09 15:03:33 UTC (rev 450) +++ branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml 2010-01-11 09:12:13 UTC (rev 451) @@ -84,6 +84,10 @@ <artifactId>ode-dao-jpa</artifactId> </dependency> <dependency> + <groupId>org.apache.ode</groupId> + <artifactId>ode-bpel-store</artifactId> + </dependency> + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </dependency> Modified: branches/ODE/ODE-2.0-maven/jbi/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/jbi/pom.xml 2010-01-09 15:03:33 UTC (rev 450) +++ branches/ODE/ODE-2.0-maven/jbi/pom.xml 2010-01-11 09:12:13 UTC (rev 451) @@ -200,7 +200,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <!-- FIXME: temporary skip it --> + <!-- FIXME: temporary skip it --> <skipTests>true</skipTests> </configuration> </plugin> Modified: branches/ODE/ODE-2.0-maven/pom.xml =================================================================== --- branches/ODE/ODE-2.0-maven/pom.xml 2010-01-09 15:03:33 UTC (rev 450) +++ branches/ODE/ODE-2.0-maven/pom.xml 2010-01-11 09:12:13 UTC (rev 451) @@ -32,7 +32,7 @@ </organization> <prerequisites> - <maven>2.0.9</maven> + <maven>2.2.1</maven> </prerequisites> <properties> @@ -110,7 +110,6 @@ <module>bpel-api-jca</module> <module>bpel-dao</module> <module>dao-jpa</module> - <module>dao-jpa-db</module> <module>jca-ra</module> <module>jca-server</module> <module>scheduler-simple</module> @@ -121,6 +120,7 @@ <module>dao-hibernate</module> <module>tools</module> <module>bpel-store</module> + <module>dao-jpa-db</module> <module>dao-hibernate-db</module> <module>engine</module> <module>bpel-connector</module>