You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by je...@apache.org on 2003/04/19 11:28:17 UTC
cvs commit: xml-forrest/src/java/components/org/apache/cocoon/transformation IdGeneratorTransformer.java XPathTransformer.java
jefft 2003/04/19 02:28:16
Modified: src/java/components/org/apache/cocoon/generation
XNIConfigurableFileGenerator.java
src/java/components/org/apache/cocoon/transformation
IdGeneratorTransformer.java XPathTransformer.java
Log:
Get components working with checked-in and CVS versions of Cocoon.
Revision Changes Path
1.2 +14 -4 xml-forrest/src/java/components/org/apache/cocoon/generation/XNIConfigurableFileGenerator.java
Index: XNIConfigurableFileGenerator.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/java/components/org/apache/cocoon/generation/XNIConfigurableFileGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XNIConfigurableFileGenerator.java 18 Apr 2003 06:46:09 -0000 1.1
+++ XNIConfigurableFileGenerator.java 19 Apr 2003 09:28:16 -0000 1.2
@@ -175,10 +175,15 @@
* @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();
}
+ // For backwards-compat with old versions of Cocoon
+ public java.io.Serializable generateKey() {
+ return getKey();
+ }
+
/**
* Generate the validity object.
* Before this method can be invoked the generateKey() method
@@ -187,11 +192,16 @@
* @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();
}
return null;
+ }
+
+ // For backwards-compat with old versions of Cocoon
+ public SourceValidity generateValidity() {
+ return getValidity();
}
/**
1.4 +6 -1 xml-forrest/src/java/components/org/apache/cocoon/transformation/IdGeneratorTransformer.java
Index: IdGeneratorTransformer.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/java/components/org/apache/cocoon/transformation/IdGeneratorTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IdGeneratorTransformer.java 15 Mar 2003 11:02:52 -0000 1.3
+++ IdGeneratorTransformer.java 19 Apr 2003 09:28:16 -0000 1.4
@@ -252,8 +252,13 @@
* @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);
+ }
+
+ // for backwards-compat
+ public Serializable generateKey() {
+ return getKey();
}
1.6 +12 -3 xml-forrest/src/java/components/org/apache/cocoon/transformation/XPathTransformer.java
Index: XPathTransformer.java
===================================================================
RCS file: /home/cvs/xml-forrest/src/java/components/org/apache/cocoon/transformation/XPathTransformer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathTransformer.java 17 Mar 2003 07:39:33 -0000 1.5
+++ XPathTransformer.java 19 Apr 2003 09:28:16 -0000 1.6
@@ -406,9 +406,13 @@
* @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);
}
+ // For backwards-compat
+ public Serializable generateKey() {
+ return getKey();
+ }
/**
* Generate the validity object.
@@ -416,8 +420,13 @@
* @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();
+ }
+
+ // for backwards-compat
+ public SourceValidity generateValidity() {
+ return getValidity();
}
/**