[jboss-svn-commits] JBL Code SVN: r26409 - in labs/jbosstm/workspace/resttx: docs and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 6 17:01:29 EDT 2009
Author: mmusgrov
Date: 2009-05-06 17:01:29 -0400 (Wed, 06 May 2009)
New Revision: 26409
Added:
labs/jbosstm/workspace/resttx/readme.txt
labs/jbosstm/workspace/resttx/recovery
Modified:
labs/jbosstm/workspace/resttx/build.xml
labs/jbosstm/workspace/resttx/docs/readme.txt
labs/jbosstm/workspace/resttx/pom.xml
Log:
Include a demo
Modified: labs/jbosstm/workspace/resttx/build.xml
===================================================================
--- labs/jbosstm/workspace/resttx/build.xml 2009-05-06 21:00:23 UTC (rev 26408)
+++ labs/jbosstm/workspace/resttx/build.xml 2009-05-06 21:01:29 UTC (rev 26409)
@@ -1,33 +1,45 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2009, Red Hat
+ Middleware LLC, and others contributors as indicated by the @authors
+ tag. All rights reserved. See the copyright.txt in the distribution
+ for a full listing of individual contributors. This copyrighted
+ material is made available to anyone wishing to use, modify, copy, or
+ redistribute it subject to the terms and conditions of the GNU Lesser
+ General Public License, v. 2.1. This program is distributed in the
+ hope that it will be useful, but WITHOUT A 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, v.2.1 along with this distribution; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+-->
<project name="REST" default="run" basedir=".">
<property name="build.classes.dir" value="target/classes/"/>
- <property name="xsrc.dir" value="src"/>
<property name="src.dir" value="src/main/java/org/jboss/jbossts/rts/client/"/>
- <property name="resteasy.dir" value="${basedir}/target/rest-tx/WEB-INF/lib"/>
+ <property name="resteasy.dir" value="${basedir}/webservice/target/rest-tx-web-1.0-M1-SNAPSHOT/WEB-INF/lib"/>
<path id="classpath">
- <pathelement location="${build.classes.dir}"/>
- <pathelement location="target/rest-tx/WEB-INF/lib/junit-4.5.jar"/>
- <pathelement location="${basedir}/target/rest-tx/WEB-INF/lib/log4j-1.2.12.jar"/>
- <pathelement location="${basedir}/target/rest-tx/WEB-INF/lib/commons-logging-1.1.jar"/>
- <pathelement location="${basedir}/target/test-classes"/>
+ <pathelement location="${basedir}/src/test/resources"/>
<fileset dir="${resteasy.dir}" >
<include name="jaxrs-api-1.0-RC1.jar"/>
<include name="resteasy-jaxrs-1.0-RC1.jar"/>
<include name="commons-httpclient-3.1.jar"/>
<include name="commons-logging-1.0.4.jar"/>
<include name="commons-codec-1.2.jar"/>
+ <include name="junit-4.5.jar"/>
+ <include name="log4j-1.2.12.jar"/>
+ <include name="commons-logging-1.1.jar"/>
<!-- jar for running an external recovery manager -->
- <include name="jbossjta-4.4.0.GA.jar"/>
+ <include name="jbossjts-4.4.0.GA.jar"/>
<include name="jbossts-common-4.4.0.GA.jar"/>
<include name="log4j-1.2.12.jar"/>
<include name="logkit-1.0.1.jar"/>
</fileset>
- <pathelement location="${basedir}/target/classes"/>
- <pathelement location="${basedir}/src/test/resources"/>
</path>
<target name="rm">
@@ -61,4 +73,11 @@
<jvmarg value="-Xmx512M" />
</java>
</target>
+
+ <target name="clean" description="clean up" >
+ <delete dir="webservice/ObjectStore"/>
+ <delete dir="webservice/logs"/>
+ <delete dir="tx/ObjectStore"/>
+ <delete dir="tx/logs"/>
+ </target>
</project>
Modified: labs/jbosstm/workspace/resttx/docs/readme.txt
===================================================================
--- labs/jbosstm/workspace/resttx/docs/readme.txt 2009-05-06 21:00:23 UTC (rev 26408)
+++ labs/jbosstm/workspace/resttx/docs/readme.txt 2009-05-06 21:01:29 UTC (rev 26409)
@@ -24,3 +24,15 @@
to the participant which sends a request back to the coordinator then they
will deadlock.
+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.
+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-06 21:00:23 UTC (rev 26408)
+++ labs/jbosstm/workspace/resttx/pom.xml 2009-05-06 21:01:29 UTC (rev 26409)
@@ -1,137 +1,34 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossts.rts</groupId>
- <artifactId>rest-tx</artifactId>
- <version>0.1</version>
- <packaging>war</packaging>
- <name/>
- <description/>
-
- <repositories>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>maven repo</id>
- <name>maven repo</name>
- <url>http://repo1.maven.org/maven2/</url>
- </repository>
- <repository>
- <id>jboss</id>
- <name>jboss repo</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- <repository>
- <id>scannotation</id>
- <url>http://scannotation.sf.net/maven2</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjta</artifactId>
- <version>4.4.0.GA</version>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossts-common</artifactId>
- <version>4.4.0.GA</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>1.0-RC1</version>
-
- <!-- filter out unwanted jars -->
- <exclusions>
- <exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
-<!--
- <exclusion>
- <groupId>tjws</groupId>
- <artifactId>webserver</artifactId>
- </exclusion>
--->
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- <version>1.0-RC1</version>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>rest-tx</finalName>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty6-plugin</artifactId>
- <version>6.0.0beta17</version>
- <configuration>
- <!-- By default the artifactId is taken, override it with something simple -->
- <contextPath>/</contextPath>
- <scanIntervalSeconds>2</scanIntervalSeconds>
- <connectors>
- <connector
- implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>9099</port>
- <host>localhost</host>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- <systemProperties>
- <systemProperty>
- <name>PORT</name>
- <value>9099</value>
- </systemProperty>
- <systemProperty>
- <name>log4j.configuration</name>
- <value>file:./src/test/resources/log4j.xml</value>
- </systemProperty>
- <systemProperty>
- <name>com.arjuna.ats.arjuna.common.propertiesFile</name>
- <value>file:./src/test/resources/jbossjta-properties.xml</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </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>
-</project>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2009, Red Hat
+ Middleware LLC, and others contributors as indicated by the @authors
+ tag. All rights reserved. See the copyright.txt in the distribution
+ for a full listing of individual contributors. This copyrighted
+ material is made available to anyone wishing to use, modify, copy, or
+ redistribute it subject to the terms and conditions of the GNU Lesser
+ General Public License, v. 2.1. This program is distributed in the
+ hope that it will be useful, but WITHOUT A 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, v.2.1 along with this distribution; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+ -->
+<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.jbossts.rts</groupId>
+ <artifactId>rest-tx</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-M1-SNAPSHOT</version>
+ <name>RESTful Transactions</name>
+ <url>http://www.jboss.org/jbosstm</url>
+
+ <modules>
+ <module>tx</module>
+ <module>webservice</module>
+ <!--
+ <module>demo</module>
+ -->
+ </modules>
+</project>
Added: labs/jbosstm/workspace/resttx/readme.txt
===================================================================
--- labs/jbosstm/workspace/resttx/readme.txt (rev 0)
+++ labs/jbosstm/workspace/resttx/readme.txt 2009-05-06 21:01:29 UTC (rev 26409)
@@ -0,0 +1,5 @@
+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)
+
+The script demo/go shows what processes to run for the demo
Added: labs/jbosstm/workspace/resttx/recovery
===================================================================
--- labs/jbosstm/workspace/resttx/recovery (rev 0)
+++ labs/jbosstm/workspace/resttx/recovery 2009-05-06 21:01:29 UTC (rev 26409)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ant rm
Property changes on: labs/jbosstm/workspace/resttx/recovery
___________________________________________________________________
Name: svn:executable
+ *
More information about the jboss-svn-commits
mailing list