[jboss-svn-commits] JBL Code SVN: r30742 - in labs/jbosstm/workspace/resttx: demo and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Dec 17 06:13:47 EST 2009


Author: mmusgrov
Date: 2009-12-17 06:13:46 -0500 (Thu, 17 Dec 2009)
New Revision: 30742

Modified:
   labs/jbosstm/workspace/resttx/demo/go
   labs/jbosstm/workspace/resttx/demo/pom.xml
   labs/jbosstm/workspace/resttx/docs/readme.txt
   labs/jbosstm/workspace/resttx/readme.txt
   labs/jbosstm/workspace/resttx/tx/pom.xml
Log:
Include maven-source-plugin making the sources are available

Modified: labs/jbosstm/workspace/resttx/demo/go
===================================================================
--- labs/jbosstm/workspace/resttx/demo/go	2009-12-17 05:49:01 UTC (rev 30741)
+++ labs/jbosstm/workspace/resttx/demo/go	2009-12-17 11:13:46 UTC (rev 30742)
@@ -5,13 +5,12 @@
 # compatability suite
 # yum install libstdc++.so.5
 
-(cd ../webservice; xterm -geom 132x40 -leftbar -sb -sl 2000 -title Coordinator -e ./go&)
-(cd ../webservice; xterm -geom 132x40 -leftbar -sb -sl 2000 -title RecoveryManager -e ./recovery&)
-
-sleep 2
-
 (cd scripts; xterm -geom 132x40 -leftbar -sb -sl 2000 -title Theatre -e python server.py port=8000&)
 (cd scripts; xterm -geom 132x40 -leftbar -sb -sl 2000 -title Restaurant -e python server.py port=8001&)
 (cd scripts; xterm -geom 132x40 -leftbar -sb -sl 2000 -title Taxi -e python server.py port=8002&)
 
+(cd ../webservice; xterm -geom 132x40 -leftbar -sb -sl 2000 -title RecoveryManager -e ./recovery&)
+(cd ../webservice; xterm -geom 132x40 -leftbar -sb -sl 2000 -title Coordinator -e ./go&)
+
+
 ./RESTDemo-shell &

Modified: labs/jbosstm/workspace/resttx/demo/pom.xml
===================================================================
--- labs/jbosstm/workspace/resttx/demo/pom.xml	2009-12-17 05:49:01 UTC (rev 30741)
+++ labs/jbosstm/workspace/resttx/demo/pom.xml	2009-12-17 11:13:46 UTC (rev 30742)
@@ -1,176 +1,191 @@
 <?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.
-        -->
+		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-demo</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>RESTful Transactions Demo</name>
-    
-    <!-- include the GWT-Maven repo as plugin, and as standard -->
-    <pluginRepositories>
-       <pluginRepository>
-         <id>gwt-maven</id>
-         <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url>
-       </pluginRepository>
-    </pluginRepositories>    
-    <repositories>
-       <repository>
-         <id>gwt-maven</id>
-         <url>
-            http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/
-          </url>
-       </repository>        
-    </repositories>
-    
-    <!--  convenience to define GWT version in one place -->
-    <properties>
-        <gwtVersion>1.5.3</gwtVersion>
-    </properties>
-    
-    <dependencies>
-        <!--  GWT deps (from central repo) -->
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-user</artifactId>
-            <version>${gwtVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-dev</artifactId>
-            <version>${gwtVersion}</version>
-            <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>
+	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-demo</artifactId>
+	<packaging>jar</packaging>
+	<version>1.0-SNAPSHOT</version>
+	<name>RESTful Transactions Demo</name>
+	
+	<!-- include the GWT-Maven repo as plugin, and as standard -->
+	<pluginRepositories>
+	   <pluginRepository>
+		 <id>gwt-maven</id>
+		 <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url>
+	   </pluginRepository>
+	</pluginRepositories>	
+	<repositories>
+	   <repository>
+		 <id>gwt-maven</id>
+		 <url>
+			http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/
+		  </url>
+	   </repository>		
+	</repositories>
+	
+	<!--  convenience to define GWT version in one place -->
+	<properties>
+		<gwtVersion>1.5.3</gwtVersion>
+	</properties>
+	
+	<dependencies>
+		<!--  GWT deps (from central repo) -->
+		<dependency>
+			<groupId>com.google.gwt</groupId>
+			<artifactId>gwt-user</artifactId>
+			<version>${gwtVersion}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.gwt</groupId>
+			<artifactId>gwt-dev</artifactId>
+			<version>${gwtVersion}</version>
+			<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>
+	</dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </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>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</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>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>create_sources_jar</id>
+						<goals> <goal>jar</goal> </goals>
+						<phase>prepare-package</phase>
+					</execution>
+				</executions>
+				<configuration>
+					<forceCreation>true</forceCreation>
+					<includePom>true</includePom>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
-    <!--  profiles (with activation per platform) -->
-    <profiles>
-        <profile>
-            <id>gwt-dev-windows</id>
-            <properties>
-                <platform>windows</platform>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-        </profile>
-        <profile>
-            <id>gwt-dev-mac</id>
-            <properties>
-                <platform>mac</platform>
-            </properties>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <os>
-                    <family>mac</family>
-                </os>
-            </activation>
-        </profile>
-        <profile>
-            <id>gwt-dev-linux</id>
-            <properties>
-                <platform>linux</platform>
-            </properties>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <os>
-                    <name>linux</name>
-                </os>
-            </activation>
-        </profile>
-    </profiles>
+	<!--  profiles (with activation per platform) -->
+	<profiles>
+		<profile>
+			<id>gwt-dev-windows</id>
+			<properties>
+				<platform>windows</platform>
+			</properties>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+		</profile>
+		<profile>
+			<id>gwt-dev-mac</id>
+			<properties>
+				<platform>mac</platform>
+			</properties>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+		</profile>
+		<profile>
+			<id>gwt-dev-linux</id>
+			<properties>
+				<platform>linux</platform>
+			</properties>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+				<os>
+					<name>linux</name>
+				</os>
+			</activation>
+		</profile>
+	</profiles>
 </project>

Modified: labs/jbosstm/workspace/resttx/docs/readme.txt
===================================================================
--- labs/jbosstm/workspace/resttx/docs/readme.txt	2009-12-17 05:49:01 UTC (rev 30741)
+++ labs/jbosstm/workspace/resttx/docs/readme.txt	2009-12-17 11:13:46 UTC (rev 30742)
@@ -1,4 +1,7 @@
-This project is work in progress.
+This project is work in progress but as far as I'm aware it all works
+(including recovery) and is bug free. Document payloads mostly consist of free
+text so the next revision will propose an XML schema for what goes into such
+payloads.
 
 mvn install # build, test and install everything
 cd webservice; mvn jetty6:run-exploded # run the coordinator and particpants

Modified: labs/jbosstm/workspace/resttx/readme.txt
===================================================================
--- labs/jbosstm/workspace/resttx/readme.txt	2009-12-17 05:49:01 UTC (rev 30741)
+++ labs/jbosstm/workspace/resttx/readme.txt	2009-12-17 11:13:46 UTC (rev 30742)
@@ -1,6 +1,3 @@
-WARNING: the recovery manager configuration in the demo is currently
-incorrect. I will fix this when I get back from JavaOne.
-
 There are some extra notes in the docs directory including the protocol
 specificaton.
 

Modified: labs/jbosstm/workspace/resttx/tx/pom.xml
===================================================================
--- labs/jbosstm/workspace/resttx/tx/pom.xml	2009-12-17 05:49:01 UTC (rev 30741)
+++ labs/jbosstm/workspace/resttx/tx/pom.xml	2009-12-17 11:13:46 UTC (rev 30742)
@@ -110,6 +110,23 @@
                <target>1.5</target>
             </configuration>
          </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>create_sources_jar</id>
+                        <goals> <goal>jar</goal> </goals>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <forceCreation>true</forceCreation>
+                    <includePom>true</includePom>
+                </configuration>
+            </plugin>
+
       </plugins>
    </build>
 </project>



More information about the jboss-svn-commits mailing list