[seam-commits] Seam SVN: r13083 - in branches/enterprise/JBPAPP_5_0: build/embedded and 3 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Tue Jun 8 10:19:26 EDT 2010
Author: manaRH
Date: 2010-06-08 10:19:25 -0400 (Tue, 08 Jun 2010)
New Revision: 13083
Modified:
branches/enterprise/JBPAPP_5_0/build/build.properties
branches/enterprise/JBPAPP_5_0/build/common.build.xml
branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml
branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml
branches/enterprise/JBPAPP_5_0/build/root.pom.xml
branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml
branches/enterprise/JBPAPP_5_0/src/resteasy/org/jboss/seam/resteasy/ResourceHome.java
Log:
upgraded resteasy to 1.2.1.GA, jboss-embedded beta3.SP13, hibernate's
Modified: branches/enterprise/JBPAPP_5_0/build/build.properties
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/build.properties 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/build/build.properties 2010-06-08 14:19:25 UTC (rev 13083)
@@ -1,6 +1,6 @@
-offline.repository.jboss.org /home/mnovotny/projects/jboss-maven-repository/maven2
+offline.repository.jboss.org /home/mnovotny/projects/jboss-maven-repository/maven2-brew
embedded.poms.dir /home/mnovotny/workspaces/jboss/jboss-seam-2_2_eap5/build/embedded
embedded.dir /home/mnovotny/projects/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded
#embedded.jars.dir /Users/pmuir/tmp/embedded-jboss-beta3/lib
#ßembedded.dist.zip /Users/pmuir/Desktop/downloads/embedded-jboss-beta3.zip
-embedded.version beta3.SP11
\ No newline at end of file
+embedded.version beta3.SP13
Modified: branches/enterprise/JBPAPP_5_0/build/common.build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/common.build.xml 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/build/common.build.xml 2010-06-08 14:19:25 UTC (rev 13083)
@@ -23,7 +23,7 @@
<property name="maven.settings.xml" location="${build.dir}/settings.xml" />
- <property name="embedded.version" value="beta3.SP11" />
+ <property name="embedded.version" value="beta3.SP13" />
<import file="${build.dir}/utilities.build.xml" />
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml 2010-06-08 14:19:25 UTC (rev 13083)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3.SP11</version>
+ <version>beta3.SP13</version>
<description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations)</description>
</project>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml 2010-06-08 14:19:25 UTC (rev 13083)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP11</version>
+ <version>beta3.SP13</version>
<description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
- <version>beta3.SP11</version>
+ <version>beta3.SP13</version>
<exclusions>
<exclusion></exclusion>
</exclusions>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml 2010-06-08 14:19:25 UTC (rev 13083)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
- <version>beta3.SP11</version>
+ <version>beta3.SP13</version>
<description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all.</description>
<dependencies>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml 2010-06-08 14:19:25 UTC (rev 13083)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>hibernate-all</artifactId>
- <version>beta3.SP11</version>
+ <version>beta3.SP13</version>
<description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate
for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations) and Hibernate Search (specific to this seam version of hibernate-all)</description>
</project>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml 2010-06-08 14:19:25 UTC (rev 13083)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
- <version>beta3.SP11</version>
+ <version>beta3.SP13</version>
<description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies
from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description>
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP11</version>
+ <version>beta3.SP13</version>
<exclusions>
<exclusion></exclusion>
</exclusions>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml 2010-06-08 14:19:25 UTC (rev 13083)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP11</version>
+ <version>beta3.SP13</version>
<description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all. This Seam specific version simply keeps the old jboss-embedded-api name for tooling compatibility</description>
<dependencies>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml 2010-06-08 14:19:25 UTC (rev 13083)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3.SP11</version>
+ <version>beta3.SP13</version>
<description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
dependencies distributed with JBoss AS. This Seam version also includes lucene, a dependency
of hibernate search</description>
Modified: branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml 2010-06-08 14:19:25 UTC (rev 13083)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
- <version>beta3.SP11</version>
+ <version>beta3.SP13</version>
<description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty
dependencies distributed with JBoss AS.</description>
</project>
Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2010-06-08 14:19:25 UTC (rev 13083)
@@ -50,7 +50,7 @@
<version.richfaces>3.3.1.SP2</version.richfaces>
<version.drools>5.0.1</version.drools>
<version.testng>5.9</version.testng>
- <version.resteasy>1.1.GA_CP01</version.resteasy>
+ <version.resteasy>1.2.1.GA</version.resteasy>
</properties>
<dependencyManagement>
@@ -283,7 +283,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>3.2.2.GA</version>
+ <version>3.2.5.GA</version>
<exclusions>
<exclusion>
<groupId>org.jboss</groupId>
@@ -299,7 +299,7 @@
<dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
- <version>2.6.13.GA</version>
+ <version>2.6.15.GA</version>
</dependency>
<dependency>
@@ -379,7 +379,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>3.3.2.GA_CP01</version>
+ <version>3.3.2.GA_CP02</version>
<exclusions>
<exclusion>
<groupId>commons-collections</groupId>
@@ -407,7 +407,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA_CP01</version>
+ <version>3.4.0.GA_CP02</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -431,7 +431,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA_CP01</version>
+ <version>3.4.0.GA_CP02</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -467,7 +467,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
- <version>3.1.1.GA_CP01</version>
+ <version>3.1.1.GA_CP02</version>
</dependency>
<dependency>
@@ -622,7 +622,7 @@
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.9.0.GA</version>
+ <version>3.12.0.GA</version>
</dependency>
<dependency>
@@ -862,7 +862,7 @@
<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
- <version>beta3.SP11</version>
+ <version>beta3.SP13</version>
</dependency>
<dependency>
Modified: branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml 2010-06-08 14:19:25 UTC (rev 13083)
@@ -12,7 +12,7 @@
<property name="seam.version" value="2.1.2"/>
<property name="jsf.version" value="1.2_12"/>
<property name="richfaces.version" value="3.3.1.GA"/>
- <property name="jboss-embedded.version" value="beta3.SP11"/>
+ <property name="jboss-embedded.version" value="beta3.SP13"/>
<target name="init-ivy">
<available property="ivy.installed" value="true" file="${ivy.jar.file}" type="file"/>
Modified: branches/enterprise/JBPAPP_5_0/src/resteasy/org/jboss/seam/resteasy/ResourceHome.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/resteasy/org/jboss/seam/resteasy/ResourceHome.java 2010-06-08 13:31:37 UTC (rev 13082)
+++ branches/enterprise/JBPAPP_5_0/src/resteasy/org/jboss/seam/resteasy/ResourceHome.java 2010-06-08 14:19:25 UTC (rev 13083)
@@ -292,8 +292,7 @@
*/
private T2 unmarshallId(String id)
{
- //StringParameterInjector injector = new StringParameterInjector(getEntityIdClass(), getEntityIdClass(), "id", PathParam.class, null, null, new Annotation[] {pathParamAnnotation}, SeamResteasyProviderFactory.getInstance());
- StringParameterInjector injector = new StringParameterInjector(getEntityIdClass(), getEntityIdClass(), "id", PathParam.class, null, null, SeamResteasyProviderFactory.getInstance());
+ StringParameterInjector injector = new StringParameterInjector(getEntityIdClass(), getEntityIdClass(), "id", PathParam.class, null, null, new Annotation[] {pathParamAnnotation}, SeamResteasyProviderFactory.getInstance());
return (T2) injector.extractValue(id);
}
More information about the seam-commits
mailing list