[gatein-commits] gatein SVN: r6035 - in components/wsrp/trunk: consumer/src/main/java/org/gatein/wsrp/consumer/handlers and 1 other directories.

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2011-03-15 11:07:48 -0400 (Tue, 15 Mar 2011)
New Revision: 6035

Modified:
   components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java
   components/wsrp/trunk/jcr-impl/pom.xml
   components/wsrp/trunk/pom.xml
Log:
- GTNWSRP-206: Updated to Chromattic 1.0.6.
- Fixed MimeResponseHandler.MarkupProcessor for API change in common 2.0.4-Beta01.

Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java	2011-03-15 14:39:34 UTC (rev 6034)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandler.java	2011-03-15 15:07:48 UTC (rev 6035)
@@ -260,7 +260,7 @@
          supportedCustomWindowStates = info.getSupportedCustomWindowStates();
       }
 
-      public String getReplacementFor(String match, String prefix, String suffix)
+      public String getReplacementFor(String match, String prefix, String suffix, boolean matchedPrefixOnly)
       {
          // We run into some issues with url encoding. We should not be making assumptions about
          // what url encoding we should be using. For example, we may be dealing with html encoding (ampersand as &)
@@ -269,8 +269,8 @@
          // we need to assume that is the correct encoding for the situation.
 
          // NOTE: there may be other encoding situations we are not currently dealing with :(
-         
-         boolean useJavaScriptEscaping = false;  
+
+         boolean useJavaScriptEscaping = false;
          // work around for GTNWSRP-93:
          if (match.contains("\\x2D") || match.contains("\\x26"))
          {
@@ -279,7 +279,7 @@
          }
 
          WSRPPortletURL portletURL = WSRPPortletURL.create(match, supportedCustomModes, supportedCustomWindowStates, true);
-         
+
          URLFormat urlFormat;
          // If the current url is using & then specify we want to use xml escaped ampersands
          if (match.contains("&"))
@@ -290,16 +290,16 @@
          {
             urlFormat = new URLFormat(format.getWantSecure(), format.getWantAuthenticated(), format.getWantRelative(), false);
          }
-         
+
          String value = context.renderURL(portletURL, urlFormat);
-         
+
          // we now need to add back the javascript url encoding if it was originally used
          // NOTE: we should fix this by specifying the escaping to be used in URLFormat when it supported (see GTNPC-41)
          if (useJavaScriptEscaping)
          {
             value = value.replaceAll("-", "\\\\x2D").replaceAll("&", "\\\\x26");
          }
-         
+
          return value;
       }
    }

Modified: components/wsrp/trunk/jcr-impl/pom.xml
===================================================================
--- components/wsrp/trunk/jcr-impl/pom.xml	2011-03-15 14:39:34 UTC (rev 6034)
+++ components/wsrp/trunk/jcr-impl/pom.xml	2011-03-15 15:07:48 UTC (rev 6035)
@@ -22,7 +22,8 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
    <parent>
       <artifactId>wsrp-parent</artifactId>
       <groupId>org.gatein.wsrp</groupId>
@@ -52,13 +53,11 @@
       <dependency>
          <groupId>org.chromattic</groupId>
          <artifactId>chromattic.api</artifactId>
-         <version>${version.chromattic}</version>
       </dependency>
       <!-- Required to process Chromattic annotations -->
       <dependency>
          <groupId>org.chromattic</groupId>
          <artifactId>chromattic.apt</artifactId>
-         <version>${version.chromattic}</version>
          <scope>provided</scope>
       </dependency>
       <dependency>

Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml	2011-03-15 14:39:34 UTC (rev 6034)
+++ components/wsrp/trunk/pom.xml	2011-03-15 15:07:48 UTC (rev 6035)
@@ -21,7 +21,8 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<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">
+<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>
 
@@ -57,7 +58,7 @@
       <version.javax.xml.ws>2.1</version.javax.xml.ws>
       <version.javax.xml.soap.saaj>1.3</version.javax.xml.soap.saaj>
       <version.google-collections>1.0</version.google-collections>
-      <version.chromattic>1.0.4</version.chromattic>
+      <version.chromattic>1.0.6</version.chromattic>
    </properties>
 
    <dependencyManagement>
@@ -173,6 +174,18 @@
             <version>${version.google-collections}</version>
          </dependency>
 
+         <dependency>
+            <groupId>org.chromattic</groupId>
+            <artifactId>chromattic.api</artifactId>
+            <version>${version.chromattic}</version>
+         </dependency>
+
+         <dependency>
+            <groupId>org.chromattic</groupId>
+            <artifactId>chromattic.apt</artifactId>
+            <version>${version.chromattic}</version>
+         </dependency>
+
          <!--
          TODO: Need to investigate this plugin to speed up tests
          <dependency>