butlermh 2003/03/14 08:29:52
Modified: src/java/org/apache/cocoon/transformation
TraxTransformer.java
Log:
removed "use-deli" parameter to turn DELI on in
sitemap.xmap. To turn DELI on or off, use the
cocoon.xconf / deli.xconf
Revision Changes Path
1.2 +2 -12
cocoon-2.0/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TraxTransformer.java 9 Mar 2003 00:03:23 -0000 1.1
+++ TraxTransformer.java 14 Mar 2003 16:29:52 -0000 1.2
@@ -168,10 +168,6 @@
/** The DELI service instance */
private Deli deli = null;
- /** Should we make the DELI CC/PP profile available to the stylesheet (default
is off) */
- private boolean useDeli = false;
- private boolean _useDeli = false;
-
/** Should we make the request parameters available in the stylesheet? (default
is off) */
private boolean useParameters = false;
private boolean _useParameters = false;
@@ -229,10 +225,6 @@
this.useSessionInfo = child.getValueAsBoolean(false);
this._useSessionInfo = this.useSessionInfo;
- child = conf.getChild("use-deli");
- this.useDeli = child.getValueAsBoolean(false);
- this._useDeli = this.useDeli;
-
child = conf.getChild("xslt-processor-role");
String xsltRole = child.getValue(XSLTProcessor.ROLE);
@@ -241,7 +233,6 @@
this.getLogger().debug("Use cookies is " + this.useCookies + " for
" + this);
this.getLogger().debug("Use browser capabilities is " +
this.useBrowserCap + " for " + this);
this.getLogger().debug("Use session info is " + this.useSessionInfo
+ " for " + this);
- this.getLogger().debug("Use DELI is " + this.useDeli + " for " +
this);
this.getLogger().debug("Use XSLTProcessor of role " + xsltRole);
}
@@ -299,7 +290,6 @@
_useBrowserCap = par.getParameterAsBoolean("use-browser-capabilities-db",
this.useBrowserCap);
_useCookies = par.getParameterAsBoolean("use-cookies", this.useCookies);
_useSessionInfo = par.getParameterAsBoolean("use-session-info",
this.useSessionInfo);
- _useDeli = par.getParameterAsBoolean("use-deli", this.useDeli);
if (this.getLogger().isDebugEnabled()) {
this.getLogger().debug("Using stylesheet:
'"+this.inputSource.getSystemId()+"' in " + this + ", last modified: " +
this.inputSource.getLastModified());
@@ -487,7 +477,7 @@
getLogger().error("Error setting Browser info", e);
}
- if (this.deli != null && this._useDeli) {
+ if (this.deli != null) {
try {
Request request = ObjectModelHelper.getRequest(objectModel);
if (map == null) {
