cziegeler 2003/10/26 23:57:26
Modified: src/java/org/apache/cocoon/environment Environment.java
EnvironmentHelper.java AbstractEnvironment.java
src/java/org/apache/cocoon/environment/wrapper
MutableEnvironmentFacade.java
src/java/org/apache/cocoon/components/source
CocoonSourceResolver.java
legal LICENSE.xml-apis
Log:
Minor addition to environment handling
Revision Changes Path
1.8 +11 -6
cocoon-2.2/src/java/org/apache/cocoon/environment/Environment.java
Index: Environment.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/Environment.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Environment.java 19 Oct 2003 14:34:40 -0000 1.7
+++ Environment.java 27 Oct 2003 07:57:26 -0000 1.8
@@ -71,17 +71,22 @@
String getURI();
/**
- * Get the prefix of the URI in progress.
+ * Set the URI to process.
+ */
+ void setURI(String value);
+
+ /**
+ * Get the prefix of the URI in progress - TODO(CZ) - Remove this
*/
String getURIPrefix();
/**
- * Get the Root Context
+ * Get the Root Context - TODO(CZ) - Remove this
*/
String getRootContext();
/**
- * Get current context
+ * Get current context - TODO(CZ) - Remove this
*/
String getContext();
@@ -97,12 +102,12 @@
/**
* Set the context. This is similar to changeContext()
- * except that it is absolute.
+ * except that it is absolute. - TODO(CZ) - Remove this
*/
void setContext(String prefix, String uri, String context);
/**
- * Change the context from uriprefix to context
+ * Change the context from uriprefix to context - TODO(CZ) - Remove this
*/
void changeContext(String uriprefix, String context) throws Exception;
1.5 +2 -3
cocoon-2.2/src/java/org/apache/cocoon/environment/EnvironmentHelper.java
Index: EnvironmentHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/EnvironmentHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EnvironmentHelper.java 24 Oct 2003 12:49:40 -0000 1.4
+++ EnvironmentHelper.java 27 Oct 2003 07:57:26 -0000 1.5
@@ -182,8 +182,7 @@
// of uris - the prefix always ends with a slash!
final int l = this.prefix.length();
uris = uris.substring(l);
- // TODO (CZ) Implement this in the environment
- // env.setURI(uris);
+ env.setURI(uris);
}
}
1.20 +8 -1
cocoon-2.2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractEnvironment.java 19 Oct 2003 14:34:40 -0000 1.19
+++ AbstractEnvironment.java 27 Oct 2003 07:57:26 -0000 1.20
@@ -159,6 +159,13 @@
return this.uris;
}
+ /* (non-Javadoc)
+ * @see
org.apache.cocoon.environment.Environment#setURI(java.lang.String)
+ */
+ public void setURI(String value) {
+ this.uris = value;
+ }
+
/**
* Get the Root Context
* TODO (CZ) Remove this method
1.6 +8 -1
cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java
Index: MutableEnvironmentFacade.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MutableEnvironmentFacade.java 27 Oct 2003 07:32:00 -0000 1.5
+++ MutableEnvironmentFacade.java 27 Oct 2003 07:57:26 -0000 1.6
@@ -104,6 +104,13 @@
}
}
+ /* (non-Javadoc)
+ * @see
org.apache.cocoon.environment.Environment#setURI(java.lang.String)
+ */
+ public void setURI(String value) {
+ // TODO Auto-generated method stub
+ }
+
public void setOutputStream(OutputStream os) {
this.env.setOutputStream(os);
}
1.4 +2 -1
cocoon-2.2/src/java/org/apache/cocoon/components/source/CocoonSourceResolver.java
Index: CocoonSourceResolver.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/CocoonSourceResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CocoonSourceResolver.java 27 Oct 2003 02:05:15 -0000 1.3
+++ CocoonSourceResolver.java 27 Oct 2003 07:57:26 -0000 1.4
@@ -91,6 +91,7 @@
if ( baseURI == null ) {
final Processor processor =
EnvironmentHelper.getCurrentProcessor();
if ( processor != null ) {
+ // FIXME (CZ) - No recursive call here, get the context from
the processor!
return processor.getSourceResolver().resolveURI(location,
null, parameters);
}
}
1.2 +5 -5 cocoon-2.2/legal/LICENSE.xml-apis
Index: LICENSE.xml-apis
===================================================================
RCS file: /home/cvs/cocoon-2.2/legal/LICENSE.xml-apis,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LICENSE.xml-apis 9 Mar 2003 00:01:43 -0000 1.1
+++ LICENSE.xml-apis 27 Oct 2003 07:57:26 -0000 1.2
@@ -1,5 +1,5 @@
-
-xml-apis is covered by The Apache Software License, Version 1.1
-
-FIXME: Put license text in here once it is available at
- http://cvs.apache.org/viewcvs.cgi/xml-commons/
+
+xml-apis is covered by The Apache Software License, Version 1.1
+
+FIXME: Put license text in here once it is available at
+ http://cvs.apache.org/viewcvs.cgi/xml-commons/
