forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r687579 - in /forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/util: IdGeneratorTransformer.java XPathTransformer.java
Date Thu, 21 Aug 2008 06:33:35 GMT
Author: crossley
Date: Wed Aug 20 23:33:35 2008
New Revision: 687579

URL: http://svn.apache.org/viewvc?rev=687579&view=rev
Log:
Do more complete revert of r111200 for these files for Cocoon-2.1 upgrade.

Modified:
    forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/util/IdGeneratorTransformer.java
    forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/util/XPathTransformer.java

Modified: forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/util/IdGeneratorTransformer.java
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/util/IdGeneratorTransformer.java?rev=687579&r1=687578&r2=687579&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/util/IdGeneratorTransformer.java
(original)
+++ forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/util/IdGeneratorTransformer.java
Wed Aug 20 23:33:35 2008
@@ -22,12 +22,11 @@
 import java.util.Map;
 
 import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
 import org.apache.cocoon.transformation.AbstractDOMTransformer;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -40,7 +39,7 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
-import org.apache.avalon.framework.component.ComponentManager;
+
 /**
  * A Transformer for adding a URL-encoded 'id' attribute to a node, whose value
  * is determined by the string value of another node.
@@ -175,10 +174,10 @@
                 }
                 getLogger().info("## Got id "+id);
                 // Use of the new version of encode method to avoid to generate URI such
as :
-                //	- <a href="#Quelques+r%E8gles...">Quelques r�gles...</a>
+                //	- <a href="#Quelques+r%E8gles...">Quelques règles...</a>
                 // Which is not, curiously, well decoded...
                 // The new methode - which allow to specify "UTF-8" gives :
-                //	- <a href="#Quelques+r%C3%A8gles...">Quelques r�gles...</a>
+                //	- <a href="#Quelques+r%C3%A8gles...">Quelques règles...</a>
                 // And it works OK,
                 String newId;
                 try {

Modified: forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/util/XPathTransformer.java
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/util/XPathTransformer.java?rev=687579&r1=687578&r2=687579&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/util/XPathTransformer.java
(original)
+++ forrest/branches/update_cocoon_2.1.12-dev/main/java/org/apache/forrest/util/XPathTransformer.java
Wed Aug 20 23:33:35 2008
@@ -23,8 +23,6 @@
 
 import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.transformation.AbstractDOMTransformer;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -106,7 +104,7 @@
 
 
     public void compose(ComponentManager manager) {
-      super.compose(manager);
+        super.compose(manager);
         try {
             this.processor = (XPathProcessor)this.manager.lookup(XPathProcessor.ROLE);
         } catch (Exception e) {



Mime
View raw message