[seam-commits] Seam SVN: r12021 - in branches/enterprise/JBPAPP_5_0: src/resteasy/org/jboss/seam/resteasy and 1 other directory.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2010-02-09 07:45:34 -0500 (Tue, 09 Feb 2010)
New Revision: 12021

Modified:
   branches/enterprise/JBPAPP_5_0/build/resteasy.pom.xml
   branches/enterprise/JBPAPP_5_0/build/root.pom.xml
   branches/enterprise/JBPAPP_5_0/src/resteasy/org/jboss/seam/resteasy/ResourceHome.java
Log:
JBPAPP-3694 downgraded resteasy to 1.1_CP01

Modified: branches/enterprise/JBPAPP_5_0/build/resteasy.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/resteasy.pom.xml	2010-02-09 12:27:26 UTC (rev 12020)
+++ branches/enterprise/JBPAPP_5_0/build/resteasy.pom.xml	2010-02-09 12:45:34 UTC (rev 12021)
@@ -30,11 +30,16 @@
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxb-provider</artifactId>
       </dependency>
-
+      
       <dependency>
-      	<groupId>org.jboss.resteasy</groupId>
-        <artifactId>resteasy-jettison-provider</artifactId>
+          <groupId>sun-fi</groupId>
+          <artifactId>FastInfoset</artifactId>
       </dependency>
+
+<!--      <dependency>-->
+<!--      	<groupId>org.jboss.resteasy</groupId>-->
+<!--        <artifactId>resteasy-jettison-provider</artifactId>-->
+<!--      </dependency>-->
       
       <dependency>
          <groupId>org.jboss.resteasy</groupId>

Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml	2010-02-09 12:27:26 UTC (rev 12020)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml	2010-02-09 12:45:34 UTC (rev 12021)
@@ -39,7 +39,7 @@
       <name>EAP5 Central Repository</name>
       <url>http://repository.jboss.org/maven2-brew</url>
     </repository>        
-    
+<!--    -->
 <!--    <repository>      -->
 <!--      <id>maven_central</id>-->
 <!--      <name>Maven Central Repository</name>-->
@@ -53,7 +53,7 @@
     <version.richfaces>3.3.1.GA</version.richfaces>
     <version.drools>5.0.1</version.drools>
     <version.testng>5.9</version.testng>
-    <version.resteasy>1.2.1.GA</version.resteasy>
+    <version.resteasy>1.1.GA_CP01</version.resteasy>
   </properties>
 
   <dependencyManagement>
@@ -367,10 +367,20 @@
          		<groupId>com.sun.xml.stream</groupId>
          		<artifactId>sjsxp</artifactId>
          	</exclusion>
+    	    <exclusion>
+                <groupId>com.sun.xml.fastinfoset</groupId>
+                <artifactId>FastInfoset</artifactId>
+            </exclusion>
          </exclusions>
       </dependency>
       
       <dependency>
+	      <groupId>sun-fi</groupId>
+	      <artifactId>FastInfoset</artifactId>
+	      <version>1.2.7</version>
+      </dependency>
+      
+      <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jettison-provider</artifactId>
          <version>${version.resteasy}</version>

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-02-09 12:27:26 UTC (rev 12020)
+++ branches/enterprise/JBPAPP_5_0/src/resteasy/org/jboss/seam/resteasy/ResourceHome.java	2010-02-09 12:45:34 UTC (rev 12021)
@@ -292,7 +292,8 @@
     */
    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, new Annotation[] {pathParamAnnotation}, SeamResteasyProviderFactory.getInstance());
+      StringParameterInjector injector = new StringParameterInjector(getEntityIdClass(), getEntityIdClass(), "id", PathParam.class, null, null, SeamResteasyProviderFactory.getInstance());
       return (T2) injector.extractValue(id);
    }