forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/etc/cocoon_upgrade cocoon-upgradepatch-20030339.patch
Date Sat, 19 Apr 2003 12:16:25 GMT
jefft       2003/04/19 05:16:25

  Modified:    etc/cocoon_upgrade cocoon-upgradepatch-20030339.patch
  Log:
  Remove unneeded patches
  
  Revision  Changes    Path
  1.2       +0 -100    xml-forrest/etc/cocoon_upgrade/cocoon-upgradepatch-20030339.patch
  
  Index: cocoon-upgradepatch-20030339.patch
  ===================================================================
  RCS file: /home/cvs/xml-forrest/etc/cocoon_upgrade/cocoon-upgradepatch-20030339.patch,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cocoon-upgradepatch-20030339.patch	29 Mar 2003 13:42:21 -0000	1.1
  +++ cocoon-upgradepatch-20030339.patch	19 Apr 2003 12:16:25 -0000	1.2
  @@ -20,56 +20,6 @@
   ? lib/core/excalibur-xmlutil-20030317.jar
   ? lib/core/logkit-1.2.jar
   ? lib/core/util.concurrent-1.3.1.jar
  -Index: src/java/components/org/apache/cocoon/transformation/IdGeneratorTransformer.java
  -===================================================================
  -RCS file: /home/cvs/xml-forrest/src/java/components/org/apache/cocoon/transformation/IdGeneratorTransformer.java,v
  -retrieving revision 1.3
  -diff -u -r1.3 IdGeneratorTransformer.java
  ---- src/java/components/org/apache/cocoon/transformation/IdGeneratorTransformer.java	15
Mar 2003 11:02:52 -0000	1.3
  -+++ src/java/components/org/apache/cocoon/transformation/IdGeneratorTransformer.java	29
Mar 2003 13:36:10 -0000
  -@@ -252,7 +252,7 @@
  -      * @return A hash of the element and id parameters, thus uniquely
  -      * identifying this IdGenerator amongst it's peers.
  -      */
  --    public Serializable generateKey() {
  -+    public Serializable getKey() {
  -         return ""+HashUtil.hash(this.elementXPath+this.idXPath);
  -     }
  - 
  -@@ -263,7 +263,7 @@
  -      * @return An "always valid" SourceValidity object. This transformer has no
  -      * inputs other than the incoming SAX events.
  -      */
  --    public SourceValidity generateValidity() {
  -+    public SourceValidity getValidity() {
  -         return new NOPValidity();
  -     }
  - 
  -Index: src/java/components/org/apache/cocoon/transformation/XPathTransformer.java
  -===================================================================
  -RCS file: /home/cvs/xml-forrest/src/java/components/org/apache/cocoon/transformation/XPathTransformer.java,v
  -retrieving revision 1.5
  -diff -u -r1.5 XPathTransformer.java
  ---- src/java/components/org/apache/cocoon/transformation/XPathTransformer.java	17 Mar 2003
07:39:33 -0000	1.5
  -+++ src/java/components/org/apache/cocoon/transformation/XPathTransformer.java	29 Mar 2003
13:36:12 -0000
  -@@ -406,7 +406,7 @@
  -      * @return A hash of the include and exclude parameters, thus uniquely
  -      * identifying this XPathTransformer amongst it's peers.
  -      */
  --    public Serializable generateKey() {
  -+    public Serializable getKey() {
  -         return ""+HashUtil.hash(this.include+this.exclude);
  -     }
  - 
  -@@ -416,7 +416,7 @@
  -      * @return An "always valid" SourceValidity object. This transformer has no
  -      * inputs other than the incoming SAX events.
  -      */
  --    public SourceValidity generateValidity() {
  -+    public SourceValidity getValidity() {
  -         return new NOPValidity();
  -     }
  - 
   Index: src/resources/forrest-shbat/forrest.build.xml
   ===================================================================
   RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/forrest.build.xml,v
  @@ -127,56 +77,6 @@
          <sequential>
            <!-- 
            | Copy all non-xdocs content across, as we cannot rely on crawling to
  -Index: src/scratchpad/src/java/org/apache/forrest/components/generator/XNIConfigurableFileGenerator.java
  -===================================================================
  -RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/components/generator/XNIConfigurableFileGenerator.java,v
  -retrieving revision 1.6
  -diff -u -r1.6 XNIConfigurableFileGenerator.java
  ---- src/scratchpad/src/java/org/apache/forrest/components/generator/XNIConfigurableFileGenerator.java
15 Mar 2003 06:18:29 -0000	1.6
  -+++ src/scratchpad/src/java/org/apache/forrest/components/generator/XNIConfigurableFileGenerator.java
29 Mar 2003 13:36:28 -0000
  -@@ -175,7 +175,7 @@
  -    * @return The generated key or <code>0</code> if the component
  -    *              is currently not cacheable.
  -    */
  --  public java.io.Serializable generateKey() {
  -+  public java.io.Serializable getKey() {
  -     return this.inputSource.getURI();
  -   }
  - 
  -@@ -187,7 +187,7 @@
  -    * @return The generated validity object or <code>null</code> if the
  -    *         component is currently not cacheable.
  -    */
  --  public SourceValidity generateValidity() {
  -+  public SourceValidity getValidity() {
  -     if (this.inputSource.getLastModified() != 0) {
  -       this.inputSource.getValidity();
  -     }
  -Index: src/scratchpad/src/java/org/apache/forrest/yer/use/cocoon/HierarchyGenerator.java
  -===================================================================
  -RCS file: /home/cvs/xml-forrest/src/scratchpad/src/java/org/apache/forrest/yer/use/cocoon/HierarchyGenerator.java,v
  -retrieving revision 1.6
  -diff -u -r1.6 HierarchyGenerator.java
  ---- src/scratchpad/src/java/org/apache/forrest/yer/use/cocoon/HierarchyGenerator.java	15
Mar 2003 06:18:29 -0000	1.6
  -+++ src/scratchpad/src/java/org/apache/forrest/yer/use/cocoon/HierarchyGenerator.java	29
Mar 2003 13:36:28 -0000
  -@@ -133,7 +133,7 @@
  -    * @return The generated key or <code>null</code> if the component
  -    *              is currently not cacheable.
  -    */
  --  public java.io.Serializable generateKey() {
  -+  public java.io.Serializable getKey() {
  -     //TODO: think about making it cacheable!
  -     return null;
  -   }
  -@@ -146,7 +146,7 @@
  -    * @return The generated validity object or <code>null</code> if the
  -    *         component is currently not cacheable.
  -    */
  --  public SourceValidity generateValidity() {
  -+  public SourceValidity getValidity() {
  -     /*
  -     if (this.inputSource.getLastModified() != 0) {
  -       return new TimeStampCacheValidity(this.inputSource.getLastModified());
   Index: src/resources/conf/cli.xconf
   ===================================================================
   RCS file: src/resources/conf/cli.xconf
  
  
  

Mime
View raw message