[jboss-svn-commits] JBL Code SVN: r26423 - in labs/jbosstm/workspace/resttx: demo and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu May 7 17:22:40 EDT 2009
Author: mmusgrov
Date: 2009-05-07 17:22:39 -0400 (Thu, 07 May 2009)
New Revision: 26423
Added:
labs/jbosstm/workspace/resttx/demo/src/main/
labs/jbosstm/workspace/resttx/demo/src/main/java/
labs/jbosstm/workspace/resttx/demo/src/main/java/org/
Removed:
labs/jbosstm/workspace/resttx/demo/src/org/
Modified:
labs/jbosstm/workspace/resttx/demo/RESTDemo-compile
labs/jbosstm/workspace/resttx/demo/RESTDemo-shell
labs/jbosstm/workspace/resttx/demo/build.xml
labs/jbosstm/workspace/resttx/demo/pom.xml
labs/jbosstm/workspace/resttx/docs/readme.txt
labs/jbosstm/workspace/resttx/pom.xml
labs/jbosstm/workspace/resttx/readme.txt
Log:
Add maven dependencies for GWT
Modified: labs/jbosstm/workspace/resttx/demo/RESTDemo-compile
===================================================================
--- labs/jbosstm/workspace/resttx/demo/RESTDemo-compile 2009-05-07 20:34:14 UTC (rev 26422)
+++ labs/jbosstm/workspace/resttx/demo/RESTDemo-compile 2009-05-07 21:22:39 UTC (rev 26423)
@@ -1,5 +1,14 @@
#!/bin/sh
APPDIR=`dirname $0`;
-GWTHOME=/usr/local/gwt-linux-1.5.3
-java -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:${GWTHOME}/gwt-linux-1.5.3/gwt-user.jar:${GWTHOME}/gwt-dev-linux.jar" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www" "$@" org.jboss.jbossts.rts.demo.TxDemo;
+
+GWTHOME="target/dependencies/"
+GWTVER=-"1.5.3"
+
+RESTTX="$APPDIR../webservice/target/rest-tx-web-1.0-M1-SNAPSHOT/WEB-INF/lib"
+TXAPI_JAR="${RESTTX}/rest-tx-api-1.0-M1-SNAPSHOT.jar"
+HTTPC_JAR="${RESTTX}/commons-httpclient-3.1.jar"
+LOG_JAR="${RESTTX}/log4j-1.2.12.jar"
+CODEC_JAR="${RESTTX}/commons-codec-1.2.jar"
+
+java -Xmx256M -cp "$APPDIR/src/main/java:$APPDIR/build:${GWTHOME}/gwt-user${GWTVER}.jar:${GWTHOME}/gwt-dev${GWTVER}-linux.jar:${TXAPI_JAR}:${HTTPC_JAR}:${LOG_JAR}:${CODEC_JAR}" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www" "$@" org.jboss.jbossts.rts.demo.TxDemo/TxDemo.html;
Modified: labs/jbosstm/workspace/resttx/demo/RESTDemo-shell
===================================================================
--- labs/jbosstm/workspace/resttx/demo/RESTDemo-shell 2009-05-07 20:34:14 UTC (rev 26422)
+++ labs/jbosstm/workspace/resttx/demo/RESTDemo-shell 2009-05-07 21:22:39 UTC (rev 26423)
@@ -2,22 +2,13 @@
APPDIR=`dirname $0`;
-#GWTHOME=target/dependencies/
-#GWTVER=-1.5.3
-GWTHOME=/usr/local/gwt-linux-1.5.3
-GWTVER=
+GWTHOME="target/dependencies/"
+GWTVER=-"1.5.3"
-GWTDEV=target/dependencies/gwt-dev-1.5.3-linux.jar
-GWTUSR=target/dependencies/gwt-user-1.5.3.jar
-#GWTDEV=/usr/local/gwt-linux-1.5.3/gwt-user
-#GWTUSR=/usr/local/gwt-linux-1.5.3/gwt-dev-linux
+RESTTX="$APPDIR../webservice/target/rest-tx-web-1.0-M1-SNAPSHOT/WEB-INF/lib"
+TXAPI_JAR="${RESTTX}/rest-tx-api-1.0-M1-SNAPSHOT.jar"
+HTTPC_JAR="${RESTTX}/commons-httpclient-3.1.jar"
+LOG_JAR="${RESTTX}/log4j-1.2.12.jar"
+CODEC_JAR="${RESTTX}/commons-codec-1.2.jar"
-RESTTX=../webservice/target/rest-tx-web-1.0-M1-SNAPSHOT/WEB-INF/lib
-TXAPI_JAR=${RESTTX}/rest-tx-api-1.0-M1-SNAPSHOT.jar
-HTTPC_JAR=${RESTTX}/commons-httpclient-3.1.jar
-LOG_JAR=${RESTTX}/log4j-1.2.12.jar
-CODEC_JAR=${RESTTX}/commons-codec-1.2.jar
-
-#JAXRS_JAR=${RESTTX}/resteasy-jaxrs-1.0-RC1.jar
-
-java -Xmx256M -cp "$APPDIR/src:$APPDIR/build:${GWTHOME}/gwt-user${GWTVER}.jar:${GWTHOME}/gwt-dev${GWTVER}-linux.jar:${TXAPI_JAR}:${HTTPC_JAR}:${LOG_JAR}:${CODEC_JAR}" com.google.gwt.dev.GWTShell -out "$APPDIR/www" "$@" org.jboss.jbossts.rts.demo.TxDemo/TxDemo.html;
+java -Xmx256M -cp "$APPDIR/src/main/java:$APPDIR/build:${GWTHOME}/gwt-user${GWTVER}.jar:${GWTHOME}/gwt-dev${GWTVER}-linux.jar:${TXAPI_JAR}:${HTTPC_JAR}:${LOG_JAR}:${CODEC_JAR}" com.google.gwt.dev.GWTShell -out "$APPDIR/www" "$@" org.jboss.jbossts.rts.demo.TxDemo/TxDemo.html;
Modified: labs/jbosstm/workspace/resttx/demo/build.xml
===================================================================
--- labs/jbosstm/workspace/resttx/demo/build.xml 2009-05-07 20:34:14 UTC (rev 26422)
+++ labs/jbosstm/workspace/resttx/demo/build.xml 2009-05-07 21:22:39 UTC (rev 26423)
@@ -24,10 +24,10 @@
<property name="build" location="build"/>
<property name="resttx.lib.dir" value="${basedir}/../webservice/target/rest-tx-web-1.0-M1-SNAPSHOT/WEB-INF/lib"/>
- <property name="xgwt.dir" location="${basedir}/target/dependencies/"/>
- <property name="xgwt.ver" location="-1.5.3"/>
- <property name="gwt.dir" location="/usr/local/gwt-linux-1.5.3/"/>
- <property name="gwt.ver" location=""/>
+ <property name="gwt.dir" location="${basedir}/target/dependencies/"/>
+ <property name="gwt.ver" location="-1.5.3"/>
+ <property name="xgwt.dir" location="/usr/local/gwt-linux-1.5.3/"/>
+ <property name="xgwt.ver" location=""/>
<property name="main.class" value="com.google.gwt.dev.GWTShell"/>
<property name="html.page" value="org.jboss.jbossts.rts.demo.TxDemo/TxDemo.html"/>
@@ -43,8 +43,8 @@
<pathelement location="${src}"/>
<fileset dir="${gwt.dir}">
- <include name="gwt-dev-linux.jar"/>
- <include name="gwt-user.jar"/>
+ <include name="gwt-dev-1.5.3-linux.jar"/>
+ <include name="gwt-user-1.5.3.jar"/>
</fileset>
<fileset dir="${resttx.lib.dir}">
Modified: labs/jbosstm/workspace/resttx/demo/pom.xml
===================================================================
--- labs/jbosstm/workspace/resttx/demo/pom.xml 2009-05-07 20:34:14 UTC (rev 26422)
+++ labs/jbosstm/workspace/resttx/demo/pom.xml 2009-05-07 21:22:39 UTC (rev 26423)
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
- <!--
- GWT-Maven example POM without google.webtoolkit.home SET (GWT as deps)
- -->
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossts.rts</groupId>
<artifactId>rest-tx-demo</artifactId>
@@ -47,6 +44,20 @@
<classifier>${platform}</classifier>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <version>${gwtVersion}</version>
+ <classifier>${platform}-libs</classifier>
+ <type>zip</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts.rts</groupId>
+ <artifactId>rest-tx-api</artifactId>
+ <version>1.0-M1-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
@@ -64,13 +75,46 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
+ <excludeTransitive>true</excludeTransitive>
+ <excludes>**/*.zip</excludes>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
+ <execution>
+ <id>unpack</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <version>${gwtVersion}</version>
+ <classifier>${platform}-libs</classifier>
+ <type>zip</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
Copied: labs/jbosstm/workspace/resttx/demo/src/main/java/org (from rev 26409, labs/jbosstm/workspace/resttx/demo/src/org)
Property changes on: labs/jbosstm/workspace/resttx/demo/src/main/java/org
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: labs/jbosstm/workspace/resttx/docs/readme.txt
===================================================================
--- labs/jbosstm/workspace/resttx/docs/readme.txt 2009-05-07 20:34:14 UTC (rev 26422)
+++ labs/jbosstm/workspace/resttx/docs/readme.txt 2009-05-07 21:22:39 UTC (rev 26423)
@@ -1,8 +1,9 @@
This project is work in progress.
+mvn install # build and install everything
mvn test # run tests
-mvn jetty6:run-exploded # run the coordinator and particpants
-ant # runs a client of the coordinator
+cd webservice; mvn jetty6:run-exploded # run the coordinator and particpants
+cd webservcie; ant # runs a client of the coordinator
Notes:
@@ -26,13 +27,7 @@
Running the demo
================
-For the demo run ant compile in the demo directory to compile the gwt server
-side proxy. Everything else in the demo compiles on demand.
+
+After running mvn install (or package) in the top level directory:
Go the the demo directory and cat the file go to see what processes need to be
running for the demo
-
-Make sure demo/build.xml and demo/RESTDemo-* point to the correct GWT location
-
-I tested my version on gwt-linux-1.5.3 from
-http://code.google.com/webtoolkit/versions.html
-
Modified: labs/jbosstm/workspace/resttx/pom.xml
===================================================================
--- labs/jbosstm/workspace/resttx/pom.xml 2009-05-07 20:34:14 UTC (rev 26422)
+++ labs/jbosstm/workspace/resttx/pom.xml 2009-05-07 21:22:39 UTC (rev 26423)
@@ -27,8 +27,6 @@
<modules>
<module>tx</module>
<module>webservice</module>
- <!--
<module>demo</module>
- -->
</modules>
</project>
Modified: labs/jbosstm/workspace/resttx/readme.txt
===================================================================
--- labs/jbosstm/workspace/resttx/readme.txt 2009-05-07 20:34:14 UTC (rev 26422)
+++ labs/jbosstm/workspace/resttx/readme.txt 2009-05-07 21:22:39 UTC (rev 26423)
@@ -1,5 +1,10 @@
-There is a more comprehensive readme in the docs directory.
-If you just want to run the demo then cd demo; ant compile; cat go
-(but make sure build.xml and RESTDemo-* point to the correct GWT location)
+There are some extra notes in the docs directory.
+ mvn install # build everything with tests
+ mvn install -Dmaven.test.skip # build everything without tests
-The script demo/go shows what processes to run for the demo
+The initial install takes some time since it downloads GWT (Google Web
+Toolkit) for the demo. GWT is quite bulky.
+
+To run the demo:
+ cd demo; cat go
+where the script demo/go shows what processes to run for the demo.
More information about the jboss-svn-commits
mailing list