[jboss-cvs] JBossAS SVN: r102043 - in projects/docs/enterprise/5.0.1/Examples/resteasy-examples: async-job-service and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 7 22:20:27 EST 2010
Author: laubai
Date: 2010-03-07 22:20:26 -0500 (Sun, 07 Mar 2010)
New Revision: 102043
Modified:
projects/docs/enterprise/5.0.1/Examples/resteasy-examples/api-clients/pom.xml
projects/docs/enterprise/5.0.1/Examples/resteasy-examples/async-job-service/pom.xml
projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/ear/pom.xml
projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/ejb/pom.xml
projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/pom.xml
projects/docs/enterprise/5.0.1/Examples/resteasy-examples/guice-hello/pom.xml
projects/docs/enterprise/5.0.1/Examples/resteasy-examples/jaxb-json/pom.xml
projects/docs/enterprise/5.0.1/Examples/resteasy-examples/resteasy-springMVC/pom.xml
projects/docs/enterprise/5.0.1/Examples/resteasy-examples/simple/pom.xml
projects/docs/enterprise/5.0.1/Examples/resteasy-examples/spring-hibernate-contacts/persistence/pom.xml
projects/docs/enterprise/5.0.1/Examples/resteasy-examples/spring-hibernate-contacts/pom.xml
Log:
Added changes required by JBPAPP-2402.
Modified: projects/docs/enterprise/5.0.1/Examples/resteasy-examples/api-clients/pom.xml
===================================================================
--- projects/docs/enterprise/5.0.1/Examples/resteasy-examples/api-clients/pom.xml 2010-03-08 00:42:36 UTC (rev 102042)
+++ projects/docs/enterprise/5.0.1/Examples/resteasy-examples/api-clients/pom.xml 2010-03-08 03:20:26 UTC (rev 102043)
@@ -7,7 +7,7 @@
<version>1.1.GA_CP01</version>
<repositories>
- <repository>
+ <!--<repository>
<id>java.net</id>
<url>http://download.java.net/maven/1</url>
<layout>legacy</layout>
@@ -16,21 +16,12 @@
<id>maven repo</id>
<name>maven repo</name>
<url>http://repo1.maven.org/maven2/</url>
- </repository>
+ </repository>-->
<!-- For resteasy -->
<repository>
<id>jboss</id>
<name>jboss repo</name>
- <url>http://repository.jboss.org/maven2-brew</url>
-
- </repository>
-
- <repository>
-
- <id>jboss</id>
-
- <name>jboss repo</name>
- <url>http://repository.jboss.org/maven2</url>
+ <url>http://repository.jboss.org/maven2-brew</url>
</repository>
</repositories>
Modified: projects/docs/enterprise/5.0.1/Examples/resteasy-examples/async-job-service/pom.xml
===================================================================
--- projects/docs/enterprise/5.0.1/Examples/resteasy-examples/async-job-service/pom.xml 2010-03-08 00:42:36 UTC (rev 102042)
+++ projects/docs/enterprise/5.0.1/Examples/resteasy-examples/async-job-service/pom.xml 2010-03-08 03:20:26 UTC (rev 102043)
@@ -11,7 +11,7 @@
<description/>
<repositories>
- <repository>
+ <!--<repository>
<id>java.net</id>
<url>http://download.java.net/maven/1</url>
<layout>legacy</layout>
@@ -20,22 +20,14 @@
<id>maven repo</id>
<name>maven repo</name>
<url>http://repo1.maven.org/maven2/</url>
- </repository>
+ </repository>-->
<!-- For resteasy -->
<repository>
<id>jboss</id>
<name>jboss repo</name>
<url>http://repository.jboss.org/maven2-brew</url>
-
</repository>
- <repository>
-
- <id>jboss</id>
-
- <name>jboss repo</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
</repositories>
<dependencies>
Modified: projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/ear/pom.xml
===================================================================
--- projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/ear/pom.xml 2010-03-08 00:42:36 UTC (rev 102042)
+++ projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/ear/pom.xml 2010-03-08 03:20:26 UTC (rev 102043)
@@ -24,9 +24,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ <version>3.4.0.GA_CP01</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/ejb/pom.xml
===================================================================
--- projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/ejb/pom.xml 2010-03-08 00:42:36 UTC (rev 102042)
+++ projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/ejb/pom.xml 2010-03-08 03:20:26 UTC (rev 102043)
@@ -17,10 +17,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
- <scope>provided</scope>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ <version>3.4.0.GA_CP01</version>
</dependency>
</dependencies>
<build>
Modified: projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/pom.xml
===================================================================
--- projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/pom.xml 2010-03-08 00:42:36 UTC (rev 102042)
+++ projects/docs/enterprise/5.0.1/Examples/resteasy-examples/ejb-integration/pom.xml 2010-03-08 03:20:26 UTC (rev 102043)
@@ -11,7 +11,7 @@
</properties>
<repositories>
- <repository>
+ <!--<repository>
<id>java.net</id>
<url>http://download.java.net/maven/1</url>
<layout>legacy</layout>
@@ -20,22 +20,13 @@
<id>maven repo</id>
<name>maven repo</name>
<url>http://repo1.maven.org/maven2/</url>
- </repository>
+ </repository>-->
<!-- For resteasy -->
<repository>
<id>jboss</id>
<name>jboss repo</name>
<url>http://repository.jboss.org/maven2-brew</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>
<modules>
Modified: projects/docs/enterprise/5.0.1/Examples/resteasy-examples/guice-hello/pom.xml
===================================================================
--- projects/docs/enterprise/5.0.1/Examples/resteasy-examples/guice-hello/pom.xml 2010-03-08 00:42:36 UTC (rev 102042)
+++ projects/docs/enterprise/5.0.1/Examples/resteasy-examples/guice-hello/pom.xml 2010-03-08 03:20:26 UTC (rev 102043)
@@ -11,7 +11,7 @@
<description>guice hello world example</description>
<repositories>
- <repository>
+ <!--<repository>
<id>java.net</id>
<url>http://download.java.net/maven/1</url>
<layout>legacy</layout>
@@ -20,21 +20,12 @@
<id>maven repo</id>
<name>maven repo</name>
<url>http://repo1.maven.org/maven2/</url>
- </repository>
+ </repository>-->
<!-- For resteasy -->
<repository>
<id>jboss</id>
<name>jboss repo</name>
<url>http://repository.jboss.org/maven2-brew</url>
-
- </repository>
-
- <repository>
-
- <id>jboss</id>
-
- <name>jboss repo</name>
- <url>http://repository.jboss.org/maven2</url>
</repository>
</repositories>
Modified: projects/docs/enterprise/5.0.1/Examples/resteasy-examples/jaxb-json/pom.xml
===================================================================
--- projects/docs/enterprise/5.0.1/Examples/resteasy-examples/jaxb-json/pom.xml 2010-03-08 00:42:36 UTC (rev 102042)
+++ projects/docs/enterprise/5.0.1/Examples/resteasy-examples/jaxb-json/pom.xml 2010-03-08 03:20:26 UTC (rev 102043)
@@ -11,7 +11,7 @@
<description/>
<repositories>
- <repository>
+ <!--<repository>
<id>java.net</id>
<url>http://download.java.net/maven/1</url>
<layout>legacy</layout>
@@ -20,22 +20,13 @@
<id>maven repo</id>
<name>maven repo</name>
<url>http://repo1.maven.org/maven2/</url>
- </repository>
+ </repository>-->
<!-- For resteasy -->
<repository>
<id>jboss</id>
<name>jboss repo</name>
<url>http://repository.jboss.org/maven2-brew</url>
-
- </repository>
-
- <repository>
-
- <id>jboss</id>
-
- <name>jboss repo</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
+ </repository>
</repositories>
<dependencies>
Modified: projects/docs/enterprise/5.0.1/Examples/resteasy-examples/resteasy-springMVC/pom.xml
===================================================================
--- projects/docs/enterprise/5.0.1/Examples/resteasy-examples/resteasy-springMVC/pom.xml 2010-03-08 00:42:36 UTC (rev 102042)
+++ projects/docs/enterprise/5.0.1/Examples/resteasy-examples/resteasy-springMVC/pom.xml 2010-03-08 03:20:26 UTC (rev 102043)
@@ -72,7 +72,7 @@
</plugins>
</build>
<repositories>
- <repository>
+ <!--<repository>
<id>java.net</id>
<url>http://download.java.net/maven/1</url>
<layout>legacy</layout>
@@ -81,25 +81,12 @@
<id>maven repo</id>
<name>maven repo</name>
<url>http://repo1.maven.org/maven2/</url>
- </repository>
+ </repository>-->
<!-- For resteasy -->
<repository>
<id>jboss</id>
<name>jboss repo</name>
<url>http://repository.jboss.org/maven2-brew</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>
-</project>
\ No newline at end of file
+</project>
Modified: projects/docs/enterprise/5.0.1/Examples/resteasy-examples/simple/pom.xml
===================================================================
--- projects/docs/enterprise/5.0.1/Examples/resteasy-examples/simple/pom.xml 2010-03-08 00:42:36 UTC (rev 102042)
+++ projects/docs/enterprise/5.0.1/Examples/resteasy-examples/simple/pom.xml 2010-03-08 03:20:26 UTC (rev 102043)
@@ -11,7 +11,7 @@
<description/>
<repositories>
- <repository>
+ <!--<repository>
<id>java.net</id>
<url>http://download.java.net/maven/1</url>
<layout>legacy</layout>
@@ -20,22 +20,13 @@
<id>maven repo</id>
<name>maven repo</name>
<url>http://repo1.maven.org/maven2/</url>
- </repository>
+ </repository>-->
<!-- For resteasy -->
<repository>
<id>jboss</id>
<name>jboss repo</name>
<url>http://repository.jboss.org/maven2-brew</url>
-
- </repository>
-
- <repository>
-
- <id>jboss</id>
-
- <name>jboss repo</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
+ </repository>
</repositories>
<dependencies>
Modified: projects/docs/enterprise/5.0.1/Examples/resteasy-examples/spring-hibernate-contacts/persistence/pom.xml
===================================================================
--- projects/docs/enterprise/5.0.1/Examples/resteasy-examples/spring-hibernate-contacts/persistence/pom.xml 2010-03-08 00:42:36 UTC (rev 102042)
+++ projects/docs/enterprise/5.0.1/Examples/resteasy-examples/spring-hibernate-contacts/persistence/pom.xml 2010-03-08 03:20:26 UTC (rev 102043)
@@ -21,9 +21,9 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.0.1B</version>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ <version>1.0.1.GA</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
@@ -37,8 +37,8 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.6.ga</version>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.2.GA</version>
</dependency>
<!-- In memory database. To replace MySQL for test -->
<dependency>
@@ -49,12 +49,12 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.3.1.GA</version>
+ <version>3.4.0.GA</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>ejb3-persistence</artifactId>
- <version>3.3.2.Beta1</version>
+ <version>3.4.0.GA_CP01</version>
</dependency>
</dependencies>
@@ -89,4 +89,4 @@
</plugins>
</build>
-->
-</project>
\ No newline at end of file
+</project>
Modified: projects/docs/enterprise/5.0.1/Examples/resteasy-examples/spring-hibernate-contacts/pom.xml
===================================================================
--- projects/docs/enterprise/5.0.1/Examples/resteasy-examples/spring-hibernate-contacts/pom.xml 2010-03-08 00:42:36 UTC (rev 102042)
+++ projects/docs/enterprise/5.0.1/Examples/resteasy-examples/spring-hibernate-contacts/pom.xml 2010-03-08 03:20:26 UTC (rev 102043)
@@ -10,7 +10,7 @@
<name>RestContact Maven Webapp</name>
<url>http://maven.apache.org</url>
<repositories>
- <repository>
+ <!--<repository>
<id>java.net</id>
<url>http://download.java.net/maven/1</url>
<layout>legacy</layout>
@@ -19,26 +19,13 @@
<id>maven repo</id>
<name>maven repo</name>
<url>http://repo1.maven.org/maven2/</url>
- </repository>
+ </repository>-->
<!-- For resteasy -->
<repository>
<id>jboss</id>
<name>jboss repo</name>
<url>http://repository.jboss.org/maven2-brew</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>
<dependencyManagement>
<dependencies>
@@ -91,20 +78,95 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>2.5.5</version>
+ <artifactId>spring-core</artifactId>
+ <version>2.5.6.SEC01</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.5.6.SEC01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>2.5.6.SEC01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>2.5.6.SEC01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.5.6.SEC01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>2.5.6.SEC01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>2.5.6.SEC01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>2.5.6.SEC01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.5.6.SEC01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>2.5.6.SEC01</version>
+ </dependency>
<!-- Test classes that integrates Junit 3.8 and 4 to Spring based applications -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>2.5.5</version>
+ <version>2.5.6.SEC01</version>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0.2</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.5.6.SEC01</version>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ <version>1.0.2.GA</version>
+ </dependency>
+ <!-- FIXME: liweinan: the following dependency is indirectly need by several other modules, but it costs too long time to fix them. So I have to add them explicitly -->
+ <!-- dom4j and commons annotation is indirectly needed by hibernate-->
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <!-- cglib is indirectly needed by spring-->
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <!-- antlr is needed during test running-->
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.6</version>
+ </dependency>
+ <!-- liweinan: end of the above section -->
</dependencies>
<build>
<finalName>RestContact</finalName>
@@ -124,4 +186,4 @@
<module>persistence</module>
<module>client</module>
</modules>
-</project>
\ No newline at end of file
+</project>
More information about the jboss-cvs-commits
mailing list