You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by rg...@apache.org on 2006/02/06 03:26:27 UTC
svn commit: r375161 - in /cocoon/branches/BRANCH_2_1_X:
src/java/org/apache/cocoon/transformation/ src/jdk1.3/ src/jdk1.3/java/
src/jdk1.3/java/org/ src/jdk1.3/java/org/apache/
src/jdk1.3/java/org/apache/cocoon/
src/jdk1.3/java/org/apache/cocoon/transf...
Author: rgoers
Date: Sun Feb 5 18:26:24 2006
New Revision: 375161
URL: http://svn.apache.org/viewcvs?rev=375161&view=rev
Log:
Replace jakarta regexp with java.util.regexp on jdk 1.4 builds for better reliability and improved performance.
Added:
cocoon/branches/BRANCH_2_1_X/src/jdk1.3/
cocoon/branches/BRANCH_2_1_X/src/jdk1.3/java/
cocoon/branches/BRANCH_2_1_X/src/jdk1.3/java/org/
cocoon/branches/BRANCH_2_1_X/src/jdk1.3/java/org/apache/
cocoon/branches/BRANCH_2_1_X/src/jdk1.3/java/org/apache/cocoon/
cocoon/branches/BRANCH_2_1_X/src/jdk1.3/java/org/apache/cocoon/transformation/
cocoon/branches/BRANCH_2_1_X/src/jdk1.3/java/org/apache/cocoon/transformation/EncodeURLTransformer.java (with props)
cocoon/branches/BRANCH_2_1_X/src/jdk1.4/
cocoon/branches/BRANCH_2_1_X/src/jdk1.4/java/
cocoon/branches/BRANCH_2_1_X/src/jdk1.4/java/org/
cocoon/branches/BRANCH_2_1_X/src/jdk1.4/java/org/apache/
cocoon/branches/BRANCH_2_1_X/src/jdk1.4/java/org/apache/cocoon/
cocoon/branches/BRANCH_2_1_X/src/jdk1.4/java/org/apache/cocoon/transformation/
cocoon/branches/BRANCH_2_1_X/src/jdk1.4/java/org/apache/cocoon/transformation/EncodeURLTransformer.java (with props)
Removed:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
Modified:
cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
Added: cocoon/branches/BRANCH_2_1_X/src/jdk1.3/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/jdk1.3/java/org/apache/cocoon/transformation/EncodeURLTransformer.java?rev=375161&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/jdk1.3/java/org/apache/cocoon/transformation/EncodeURLTransformer.java (added)
+++ cocoon/branches/BRANCH_2_1_X/src/jdk1.3/java/org/apache/cocoon/transformation/EncodeURLTransformer.java Sun Feb 5 18:26:24 2006
@@ -0,0 +1,416 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.transformation;
+
+import java.io.IOException;
+import java.util.Map;
+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.cocoon.ProcessingException;
+import org.apache.cocoon.caching.CacheableProcessingComponent;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Response;
+import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.transformation.AbstractTransformer;
+import org.apache.excalibur.source.SourceValidity;
+import org.apache.excalibur.source.impl.validity.NOPValidity;
+import org.apache.regexp.RE;
+import org.apache.regexp.RESyntaxException;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+/**
+ * @cocoon.sitemap.component.documentation
+ * The encodeURL transformer emits encoded URLs.
+ *
+ * @cocoon.sitemap.component.name encodeurl
+ * @cocoon.sitemap.component.logger sitemap.transformer.encodeURL
+ * @cocoon.sitemap.component.documentation.caching
+ * TBD
+ *
+ * @cocoon.sitemap.component.pooling.max 32
+ *
+ * The encodeURL transformer emits encoded URLs.
+ * <p>
+ * This transformer applies encodeURL method to URLs.
+ * You may want to use this transform to avoid doing the manually
+ * encodeURL() calls.
+ * </p>
+ * <p>
+ * Usually this transformer is appended as last transformer before
+ * the serialization process. In this case it is possible to encode
+ * URLs introduced in the generator, and xslt transformer phase.
+ * </p>
+ * <p>
+ * You can specify which attributes hold URL values in order to restrict
+ * URL rewriting to specific attributes only.
+ * </p>
+ * <p>
+ * Usage in a sitemap:
+ * </p>
+ * <pre><tt>
+ * <map:composition>
+ * ...
+ * <map:transformers>
+ * ...
+ * <map:transformer type="encodeURL"
+ * src="org.apache.cocoon.optional.transformation.EncodeURLTransformer">
+ * <exclude-name>img/@src|a/@href=.&asterik;adserver</exclude-name>
+ * <include-name>.&asterik;/@href|.&asterik;/@src|.&asterik;/@action</include-name>
+ * </map:transformer>
+ * ...
+ * <map:pipelines>
+ * <map:pipeline>
+ * ...
+ * <map:transform type="encodeURL"/>
+ * ...
+ * </pre></tt>
+ *
+ * @author <a href="mailto:bh22351@i-one.at">Bernhard Huber</a>
+ * @version CVS $Id: EncodeURLTransformer.java 153376 2005-02-11 08:50:21Z cziegeler $
+ */
+public class EncodeURLTransformer
+ extends AbstractTransformer
+ implements Configurable, CacheableProcessingComponent {
+
+ /**
+ * Configuration name for specifying excluding patterns,
+ * ie exclude-name.
+ */
+ public final static String EXCLUDE_NAME = "exclude-name";
+
+ /**
+ * Configuration name for specifying including patterns,
+ * ie include-name.
+ */
+ public final static String INCLUDE_NAME = "include-name";
+
+ /**
+ * Configuration default exclude pattern,
+ * ie img/@src
+ */
+ public final static String EXCLUDE_NAME_DEFAULT = "img/@src";
+
+ /**
+ * Configuration default exclude pattern,
+ * ie .*\/@href|.*\/@action|frame/@src
+ */
+ public final static String INCLUDE_NAME_DEFAULT = ".*/@href|.*/@action|frame/@src";
+
+ private String includeNameConfigure = INCLUDE_NAME_DEFAULT;
+ private String excludeNameConfigure = EXCLUDE_NAME_DEFAULT;
+
+ private ElementAttributeMatching elementAttributeMatching;
+ private Response response;
+ private boolean isEncodeURLNeeded;
+ private Session session;
+
+ /**
+ * check if encoding of URLs is neccessary.
+ *
+ * This is true if session object exists, and session-id
+ * was provided from URL, or session is new.
+ * The result is stored in some instance variables
+ */
+ protected void checkForEncoding(Request request) {
+ this.session = request.getSession(false);
+ this.isEncodeURLNeeded = false;
+
+ if ( null != this.session ) {
+ // do encoding if session id is from URL, or the session is new,
+ // fixes BUG #13855, due to paint007@mc.duke.edu
+ if ( request.isRequestedSessionIdFromURL() || this.session.isNew()) {
+ this.isEncodeURLNeeded = true;
+ }
+ }
+ }
+
+ /**
+ * Setup the transformer.
+ * <p>
+ * Setup include, and exclude patterns from the parameters
+ * </p>
+ *
+ * @param resolver source resolver
+ * @param objectModel sitemap objects
+ * @param parameters request parameters
+ *
+ */
+ public void setup(SourceResolver resolver, Map objectModel, String source, Parameters parameters)
+ throws ProcessingException, SAXException, IOException {
+
+ this.checkForEncoding(ObjectModelHelper.getRequest(objectModel));
+
+ if (this.isEncodeURLNeeded) {
+ this.response = ObjectModelHelper.getResponse(objectModel);
+
+ // don't check if URL encoding is needed now, as
+ // a generator might create a new session
+ final String includeName = parameters.getParameter(INCLUDE_NAME,
+ this.includeNameConfigure);
+ final String excludeName = parameters.getParameter(EXCLUDE_NAME,
+ this.excludeNameConfigure);
+ try {
+ this.elementAttributeMatching = new ElementAttributeMatching(includeName, excludeName);
+ } catch (RESyntaxException reex) {
+ final String message = "Cannot parse include-name: " + includeName + " " +
+ "or exclude-name: " + excludeName + "!";
+ throw new ProcessingException(message, reex);
+ }
+ }
+ }
+
+
+ /**
+ * BEGIN SitemapComponent methods
+ *
+ * @param configuration Description of Parameter
+ * @exception ConfigurationException Description of Exception
+ */
+ public void configure(Configuration configuration) throws ConfigurationException {
+ Configuration child;
+
+ child = configuration.getChild(INCLUDE_NAME);
+ this.includeNameConfigure = child.getValue(INCLUDE_NAME_DEFAULT);
+
+ child = configuration.getChild(EXCLUDE_NAME);
+ this.excludeNameConfigure = child.getValue(EXCLUDE_NAME_DEFAULT);
+
+ if (this.includeNameConfigure == null) {
+ String message = "Configure " + INCLUDE_NAME + "!";
+ throw new ConfigurationException(message);
+ }
+ if (this.excludeNameConfigure == null) {
+ String message = "Configure " + EXCLUDE_NAME + "!";
+ throw new ConfigurationException(message);
+ }
+ }
+
+
+ /**
+ * Recycle resources of this transformer
+ */
+ public void recycle() {
+ super.recycle();
+ this.response = null;
+ this.session = null;
+ this.elementAttributeMatching = null;
+ }
+
+
+ /**
+ * Generate the unique key.
+ * This key must be unique inside the space of this component.
+ *
+ * @return The generated key hashes the src
+ */
+ public java.io.Serializable getKey() {
+ if (this.isEncodeURLNeeded) {
+ return null;
+ } else {
+ return "1";
+ }
+ }
+
+ /**
+ * Generate the validity object.
+ *
+ * @return The generated validity object or <code>null</code> if the
+ * component is currently not cacheable.
+ */
+ public SourceValidity getValidity() {
+ if (this.isEncodeURLNeeded) {
+ return null;
+ } else {
+ return NOPValidity.SHARED_INSTANCE;
+ }
+ }
+
+ /**
+ * Start parsing an element
+ *
+ * @param uri of the element
+ * @param name of the element
+ * @param raw name of the element
+ * @param attributes list
+ * @exception SAXException Description of Exception
+ */
+ public void startElement(String uri, String name, String raw, Attributes attributes)
+ throws SAXException {
+ if (this.isEncodeURLNeeded && this.elementAttributeMatching != null) {
+ String lname = name;
+ if (attributes != null && attributes.getLength() > 0) {
+ AttributesImpl new_attributes = new AttributesImpl(attributes);
+ for (int i = 0; i < new_attributes.getLength(); i++) {
+ String attr_lname = new_attributes.getLocalName(i);
+
+ String value = new_attributes.getValue(i);
+
+ if (elementAttributeMatching.matchesElementAttribute(lname, attr_lname, value)) {
+ // don't use simply this.response.encodeURL(value)
+ // but be more smart about the url encoding
+ final String new_value = this.encodeURL(value);
+ if (getLogger().isDebugEnabled()) {
+ this.getLogger().debug("element/@attribute matches: " + name + "/@" + attr_lname);
+ this.getLogger().debug("encodeURL: " + value + " -> " + new_value);
+ }
+ new_attributes.setValue(i, new_value);
+ }
+ }
+ // parent handles element using encoded attribute values
+ super.contentHandler.startElement(uri, name, raw, new_attributes);
+ return;
+ }
+ }
+ // no match, parent handles element as-is
+ super.contentHandler.startElement(uri, name, raw, attributes);
+ }
+
+ /**
+ * Do the URL rewriting.
+ * <p>
+ * Check if <code>url</code> contains already the sessionid, some servlet-engines
+ * just appends the session-id without checking if the sessionid is already present.
+ * </p>
+ *
+ * @param url the URL probably without sessionid.
+ * @return String the original url inclusive the sessionid
+ */
+ private String encodeURL(String url) {
+ String encoded_url;
+ if (this.response != null) {
+ // As some servlet-engine does not check if url has been already rewritten
+ if (this.session != null && url.indexOf(this.session.getId()) > -1) {
+ // url contains already the session id encoded
+ encoded_url = url;
+ } else {
+ // do encode the session id
+ encoded_url = this.response.encodeURL(url);
+ }
+ } else {
+ encoded_url = url;
+ }
+ return encoded_url;
+ }
+
+ /**
+ * A helper class for matching element names, and attribute names.
+ *
+ * <p>
+ * For given include-name, exclude-name decide if element-attribute pair
+ * matches. This class defines the precedence and matching algorithm.
+ * </p>
+ *
+ * @author <a href="mailto:bh22351@i-one.at">Bernhard Huber</a>
+ * @version CVS $Id: EncodeURLTransformer.java 153376 2005-02-11 08:50:21Z cziegeler $
+ */
+ public static class ElementAttributeMatching {
+ /**
+ * Regular expression of including patterns
+ *
+ */
+ protected RE includeNameRE;
+ /**
+ * Regular expression of excluding patterns
+ *
+ */
+ protected RE excludeNameRE;
+
+
+ /**
+ *Constructor for the ElementAttributeMatching object
+ *
+ * @param includeName Description of Parameter
+ * @param excludeName Description of Parameter
+ * @exception RESyntaxException Description of Exception
+ */
+ public ElementAttributeMatching(String includeName, String excludeName) throws RESyntaxException {
+ includeNameRE = new RE(includeName, RE.MATCH_CASEINDEPENDENT);
+ excludeNameRE = new RE(excludeName, RE.MATCH_CASEINDEPENDENT);
+ }
+
+
+ /**
+ * Return true iff element_name attr_name pair is not matched by exclude-name,
+ * but is matched by include-name
+ * @param element_name
+ * @param attr_name
+ * @param value TODO
+ *
+ * @return boolean true iff value of attribute_name should get rewritten, else
+ * false.
+ */
+ public boolean matchesElementAttribute(String element_name, String attr_name, String value) {
+ String element_attr_name = canonicalizeElementAttribute(element_name, attr_name, value);
+
+ if (excludeNameRE != null && includeNameRE != null) {
+ return !matchesExcludesElementAttribute(element_attr_name) &&
+ matchesIncludesElementAttribute(element_attr_name);
+ } else {
+ return false;
+ }
+ }
+
+
+ /**
+ * Build from elementname, and attribute name a single string.
+ * <p>
+ * String concatenated <code>element name + "/@" + attribute name</code>
+ * is matched against the include and excluding patterns.
+ * </p>
+ * @param element_name Description of Parameter
+ * @param attr_name Description of Parameter
+ * @param value The value
+ *
+ * @return Description of the Returned Value
+ */
+ private String canonicalizeElementAttribute(String element_name, String attr_name, String value) {
+ return element_name + "/@" + attr_name + "=" + value;
+ }
+
+
+ /**
+ * Return true iff element_name attr_name pair is matched by exclude-name.
+ *
+ * @param element_attr_name
+ * @return boolean true iff exclude-name matches element_name, attr_name, else
+ * false.
+ */
+ private boolean matchesExcludesElementAttribute(String element_attr_name) {
+ boolean match = excludeNameRE.match(element_attr_name);
+ return match;
+ }
+
+
+ /**
+ * Return true iff element_name attr_name pair is matched by include-name.
+ *
+ * @param element_attr_name
+ * @return boolean true iff include-name matches element_name, attr_name, else
+ * false.
+ */
+ private boolean matchesIncludesElementAttribute(String element_attr_name) {
+ boolean match = includeNameRE.match(element_attr_name);
+ return match;
+ }
+ }
+}
+
Propchange: cocoon/branches/BRANCH_2_1_X/src/jdk1.3/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
------------------------------------------------------------------------------
svn:executable = *
Added: cocoon/branches/BRANCH_2_1_X/src/jdk1.4/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/jdk1.4/java/org/apache/cocoon/transformation/EncodeURLTransformer.java?rev=375161&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/jdk1.4/java/org/apache/cocoon/transformation/EncodeURLTransformer.java (added)
+++ cocoon/branches/BRANCH_2_1_X/src/jdk1.4/java/org/apache/cocoon/transformation/EncodeURLTransformer.java Sun Feb 5 18:26:24 2006
@@ -0,0 +1,417 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.transformation;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+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.cocoon.ProcessingException;
+import org.apache.cocoon.caching.CacheableProcessingComponent;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Response;
+import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.transformation.AbstractTransformer;
+import org.apache.excalibur.source.SourceValidity;
+import org.apache.excalibur.source.impl.validity.NOPValidity;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+/**
+ * @cocoon.sitemap.component.documentation
+ * The encodeURL transformer emits encoded URLs.
+ *
+ * @cocoon.sitemap.component.name encodeurl
+ * @cocoon.sitemap.component.logger sitemap.transformer.encodeURL
+ * @cocoon.sitemap.component.documentation.caching
+ * TBD
+ *
+ * @cocoon.sitemap.component.pooling.max 32
+ *
+ * The encodeURL transformer emits encoded URLs.
+ * <p>
+ * This transformer applies encodeURL method to URLs.
+ * You may want to use this transform to avoid doing the manually
+ * encodeURL() calls.
+ * </p>
+ * <p>
+ * Usually this transformer is appended as last transformer before
+ * the serialization process. In this case it is possible to encode
+ * URLs introduced in the generator, and xslt transformer phase.
+ * </p>
+ * <p>
+ * You can specify which attributes hold URL values in order to restrict
+ * URL rewriting to specific attributes only.
+ * </p>
+ * <p>
+ * Usage in a sitemap:
+ * </p>
+ * <pre><tt>
+ * <map:composition>
+ * ...
+ * <map:transformers>
+ * ...
+ * <map:transformer type="encodeURL"
+ * src="org.apache.cocoon.optional.transformation.EncodeURLTransformer">
+ * <exclude-name>img/@src|a/@href=.&asterik;adserver</exclude-name>
+ * <include-name>.&asterik;/@href|.&asterik;/@src|.&asterik;/@action</include-name>
+ * </map:transformer>
+ * ...
+ * <map:pipelines>
+ * <map:pipeline>
+ * ...
+ * <map:transform type="encodeURL"/>
+ * ...
+ * </pre></tt>
+ *
+ * @author <a href="mailto:bh22351@i-one.at">Bernhard Huber</a>
+ * @version CVS $Id: EncodeURLTransformer.java 153376 2005-02-11 08:50:21Z cziegeler $
+ */
+public class EncodeURLTransformer
+ extends AbstractTransformer
+ implements Configurable, CacheableProcessingComponent {
+
+ /**
+ * Configuration name for specifying excluding patterns,
+ * ie exclude-name.
+ */
+ public final static String EXCLUDE_NAME = "exclude-name";
+
+ /**
+ * Configuration name for specifying including patterns,
+ * ie include-name.
+ */
+ public final static String INCLUDE_NAME = "include-name";
+
+ /**
+ * Configuration default exclude pattern,
+ * ie img/@src
+ */
+ public final static String EXCLUDE_NAME_DEFAULT = "img/@src";
+
+ /**
+ * Configuration default exclude pattern,
+ * ie .*\/@href|.*\/@action|frame/@src
+ */
+ public final static String INCLUDE_NAME_DEFAULT = ".*/@href|.*/@action|frame/@src";
+
+ private String includeNameConfigure = INCLUDE_NAME_DEFAULT;
+ private String excludeNameConfigure = EXCLUDE_NAME_DEFAULT;
+
+ private ElementAttributeMatching elementAttributeMatching;
+ private Response response;
+ private boolean isEncodeURLNeeded;
+ private Session session;
+
+ /**
+ * check if encoding of URLs is neccessary.
+ *
+ * This is true if session object exists, and session-id
+ * was provided from URL, or session is new.
+ * The result is stored in some instance variables
+ */
+ protected void checkForEncoding(Request request) {
+ this.session = request.getSession(false);
+ this.isEncodeURLNeeded = false;
+
+ if ( null != this.session ) {
+ // do encoding if session id is from URL, or the session is new,
+ // fixes BUG #13855, due to paint007@mc.duke.edu
+ if ( request.isRequestedSessionIdFromURL() || this.session.isNew()) {
+ this.isEncodeURLNeeded = true;
+ }
+ }
+ }
+
+ /**
+ * Setup the transformer.
+ * <p>
+ * Setup include, and exclude patterns from the parameters
+ * </p>
+ *
+ * @param resolver source resolver
+ * @param objectModel sitemap objects
+ * @param parameters request parameters
+ *
+ */
+ public void setup(SourceResolver resolver, Map objectModel, String source, Parameters parameters)
+ throws ProcessingException, SAXException, IOException {
+
+ this.checkForEncoding(ObjectModelHelper.getRequest(objectModel));
+
+ if (this.isEncodeURLNeeded) {
+ this.response = ObjectModelHelper.getResponse(objectModel);
+
+ // don't check if URL encoding is needed now, as
+ // a generator might create a new session
+ final String includeName = parameters.getParameter(INCLUDE_NAME,
+ this.includeNameConfigure);
+ final String excludeName = parameters.getParameter(EXCLUDE_NAME,
+ this.excludeNameConfigure);
+ try {
+ this.elementAttributeMatching = new ElementAttributeMatching(includeName, excludeName);
+ } catch (PatternSyntaxException reex) {
+ final String message = "Cannot parse include-name: " + includeName + " " +
+ "or exclude-name: " + excludeName + "!";
+ throw new ProcessingException(message, reex);
+ }
+ }
+ }
+
+
+ /**
+ * BEGIN SitemapComponent methods
+ *
+ * @param configuration Description of Parameter
+ * @exception ConfigurationException Description of Exception
+ */
+ public void configure(Configuration configuration) throws ConfigurationException {
+ Configuration child;
+
+ child = configuration.getChild(INCLUDE_NAME);
+ this.includeNameConfigure = child.getValue(INCLUDE_NAME_DEFAULT);
+
+ child = configuration.getChild(EXCLUDE_NAME);
+ this.excludeNameConfigure = child.getValue(EXCLUDE_NAME_DEFAULT);
+
+ if (this.includeNameConfigure == null) {
+ String message = "Configure " + INCLUDE_NAME + "!";
+ throw new ConfigurationException(message);
+ }
+ if (this.excludeNameConfigure == null) {
+ String message = "Configure " + EXCLUDE_NAME + "!";
+ throw new ConfigurationException(message);
+ }
+ }
+
+
+ /**
+ * Recycle resources of this transformer
+ */
+ public void recycle() {
+ super.recycle();
+ this.response = null;
+ this.session = null;
+ this.elementAttributeMatching = null;
+ }
+
+
+ /**
+ * Generate the unique key.
+ * This key must be unique inside the space of this component.
+ *
+ * @return The generated key hashes the src
+ */
+ public java.io.Serializable getKey() {
+ if (this.isEncodeURLNeeded) {
+ return null;
+ } else {
+ return "1";
+ }
+ }
+
+ /**
+ * Generate the validity object.
+ *
+ * @return The generated validity object or <code>null</code> if the
+ * component is currently not cacheable.
+ */
+ public SourceValidity getValidity() {
+ if (this.isEncodeURLNeeded) {
+ return null;
+ } else {
+ return NOPValidity.SHARED_INSTANCE;
+ }
+ }
+
+ /**
+ * Start parsing an element
+ *
+ * @param uri of the element
+ * @param name of the element
+ * @param raw name of the element
+ * @param attributes list
+ * @exception SAXException Description of Exception
+ */
+ public void startElement(String uri, String name, String raw, Attributes attributes)
+ throws SAXException {
+ if (this.isEncodeURLNeeded && this.elementAttributeMatching != null) {
+ String lname = name;
+ if (attributes != null && attributes.getLength() > 0) {
+ AttributesImpl new_attributes = new AttributesImpl(attributes);
+ for (int i = 0; i < new_attributes.getLength(); i++) {
+ String attr_lname = new_attributes.getLocalName(i);
+
+ String value = new_attributes.getValue(i);
+
+ if (elementAttributeMatching.matchesElementAttribute(lname, attr_lname, value)) {
+ // don't use simply this.response.encodeURL(value)
+ // but be more smart about the url encoding
+ final String new_value = this.encodeURL(value);
+ if (getLogger().isDebugEnabled()) {
+ this.getLogger().debug("element/@attribute matches: " + name + "/@" + attr_lname);
+ this.getLogger().debug("encodeURL: " + value + " -> " + new_value);
+ }
+ new_attributes.setValue(i, new_value);
+ }
+ }
+ // parent handles element using encoded attribute values
+ super.contentHandler.startElement(uri, name, raw, new_attributes);
+ return;
+ }
+ }
+ // no match, parent handles element as-is
+ super.contentHandler.startElement(uri, name, raw, attributes);
+ }
+
+ /**
+ * Do the URL rewriting.
+ * <p>
+ * Check if <code>url</code> contains already the sessionid, some servlet-engines
+ * just appends the session-id without checking if the sessionid is already present.
+ * </p>
+ *
+ * @param url the URL probably without sessionid.
+ * @return String the original url inclusive the sessionid
+ */
+ private String encodeURL(String url) {
+ String encoded_url;
+ if (this.response != null) {
+ // As some servlet-engine does not check if url has been already rewritten
+ if (this.session != null && url.indexOf(this.session.getId()) > -1) {
+ // url contains already the session id encoded
+ encoded_url = url;
+ } else {
+ // do encode the session id
+ encoded_url = this.response.encodeURL(url);
+ }
+ } else {
+ encoded_url = url;
+ }
+ return encoded_url;
+ }
+
+ /**
+ * A helper class for matching element names, and attribute names.
+ *
+ * <p>
+ * For given include-name, exclude-name decide if element-attribute pair
+ * matches. This class defines the precedence and matching algorithm.
+ * </p>
+ *
+ * @author <a href="mailto:bh22351@i-one.at">Bernhard Huber</a>
+ * @version CVS $Id: EncodeURLTransformer.java 153376 2005-02-11 08:50:21Z cziegeler $
+ */
+ public static class ElementAttributeMatching {
+ /**
+ * Regular expression of including patterns
+ *
+ */
+ protected Pattern includeNameRE;
+ /**
+ * Regular expression of excluding patterns
+ *
+ */
+ protected Pattern excludeNameRE;
+
+
+ /**
+ *Constructor for the ElementAttributeMatching object
+ *
+ * @param includeName Description of Parameter
+ * @param excludeName Description of Parameter
+ * @exception PatternSyntaxException Description of Exception
+ */
+ public ElementAttributeMatching(String includeName, String excludeName) throws PatternSyntaxException {
+ includeNameRE = Pattern.compile(includeName, Pattern.CASE_INSENSITIVE);
+ excludeNameRE = Pattern.compile(excludeName, Pattern.CASE_INSENSITIVE);
+ }
+
+
+ /**
+ * Return true iff element_name attr_name pair is not matched by exclude-name,
+ * but is matched by include-name
+ * @param element_name
+ * @param attr_name
+ * @param value TODO
+ *
+ * @return boolean true iff value of attribute_name should get rewritten, else
+ * false.
+ */
+ public boolean matchesElementAttribute(String element_name, String attr_name, String value) {
+ String element_attr_name = canonicalizeElementAttribute(element_name, attr_name, value);
+
+ if (excludeNameRE != null && includeNameRE != null) {
+ return !matchesExcludesElementAttribute(element_attr_name) &&
+ matchesIncludesElementAttribute(element_attr_name);
+ } else {
+ return false;
+ }
+ }
+
+
+ /**
+ * Build from elementname, and attribute name a single string.
+ * <p>
+ * String concatenated <code>element name + "/@" + attribute name</code>
+ * is matched against the include and excluding patterns.
+ * </p>
+ * @param element_name Description of Parameter
+ * @param attr_name Description of Parameter
+ * @param value The value
+ *
+ * @return Description of the Returned Value
+ */
+ private String canonicalizeElementAttribute(String element_name, String attr_name, String value) {
+ return element_name + "/@" + attr_name + "=" + value;
+ }
+
+
+ /**
+ * Return true iff element_name attr_name pair is matched by exclude-name.
+ *
+ * @param element_attr_name
+ * @return boolean true iff exclude-name matches element_name, attr_name, else
+ * false.
+ */
+ private boolean matchesExcludesElementAttribute(String element_attr_name) {
+ boolean match = excludeNameRE.matcher(element_attr_name).matches();
+ return match;
+ }
+
+
+ /**
+ * Return true iff element_name attr_name pair is matched by include-name.
+ *
+ * @param element_attr_name
+ * @return boolean true iff include-name matches element_name, attr_name, else
+ * false.
+ */
+ private boolean matchesIncludesElementAttribute(String element_attr_name) {
+ boolean match = includeNameRE.matcher(element_attr_name).matches();
+ return match;
+ }
+ }
+}
+
Propchange: cocoon/branches/BRANCH_2_1_X/src/jdk1.4/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
------------------------------------------------------------------------------
svn:executable = *
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml?rev=375161&r1=375160&r2=375161&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml Sun Feb 5 18:26:24 2006
@@ -65,6 +65,9 @@
<target name="compile-core" depends="compile-mocks, clover.on">
<cocoon.compile srcdir="${java}"
destdir="${build.dest}"/>
+ <echo>Compiling jdk ${used.vm} core classes</echo>
+ <cocoon.compile srcdir="${jdk.java}"
+ destdir="${build.dest}"/>
</target>
<!-- compiles deprecated code -->
Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml?rev=375161&r1=375160&r2=375161&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml Sun Feb 5 18:26:24 2006
@@ -40,6 +40,14 @@
</condition>
<fail unless="target.vm">Please use a JVM 1.3 or superior to compile cocoon ${version}</fail>
+ <condition property="used.vm" value="${target.vm}" else="1.4">
+ <or>
+ <equals arg1="1.3" arg2="${target.vm}"/>
+ <equals arg1="1.4" arg2="${target.vm}"/>
+ </or>
+ </condition>
+ <property name="jdk.java" value="${src}${file.separator}jdk${used.vm}${file.separator}java"/>
+
<!-- The location of tools.jar, relative to the JAVA_HOME home. -->
<property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
<available file="${tools.jar}" property="tools.jar.present"/>
Re: regexp
Posted by Antonio Gallardo <ag...@agssa.net>.
Ralph Goers wrote:
> So once all references in our code are gone it can be removed?
Maybe not, ie xalan needs regexp. :-S
Best Regards,
Antonio Gallardo.
>
> Joerg Heinicke wrote:
>
>> On 10.02.2006 23:29, Ralph Goers wrote:
>>
>>> I ran a grep a while ago and found that there was one other place that
>>> used Jakarta regexp. I think it was SourceUtil. I did not change
>>> that. Jakarta regexp is in the lib/endorsed directory. I have no
>>> idea why. I
>>> presume some other package we are using requires it.
>>
>>
>>
>> It is in the endorsed dir because an older version of it comes with
>> the newer Sun JDKs (I think 1.5 and later). So we have the same
>> problem as with the XML libs.
>>
>> Jörg
>
Re: regexp
Posted by Ralph Goers <Ra...@dslextreme.com>.
So once all references in our code are gone it can be removed?
Joerg Heinicke wrote:
> On 10.02.2006 23:29, Ralph Goers wrote:
>
>> I ran a grep a while ago and found that there was one other place that
>> used Jakarta regexp. I think it was SourceUtil. I did not change
>> that. Jakarta regexp is in the lib/endorsed directory. I have no
>> idea why. I
>> presume some other package we are using requires it.
>
>
> It is in the endorsed dir because an older version of it comes with
> the newer Sun JDKs (I think 1.5 and later). So we have the same
> problem as with the XML libs.
>
> Jörg
Re: regexp
Posted by Joerg Heinicke <jo...@gmx.de>.
On 10.02.2006 23:29, Ralph Goers wrote:
> I ran a grep a while ago and found that there was one other place that
> used Jakarta regexp. I think it was SourceUtil. I did not change that.
> Jakarta regexp is in the lib/endorsed directory. I have no idea why. I
> presume some other package we are using requires it.
It is in the endorsed dir because an older version of it comes with the
newer Sun JDKs (I think 1.5 and later). So we have the same problem as
with the XML libs.
Jörg
Re: regexp,
Re: svn commit: r375161 - in
/cocoon/branches/BRANCH_2_1_X:src/java/org/apache/cocoon/transformatio
n/ src/jdk1.3/ src/jdk1.3/java/
src/jdk1.3/java/org/src/jdk1.3/java/org/apache/
src/jdk1.3/java/org/apache/cocoon/
src/jdk1.3/java/org/apache/cocoon/transf...
Posted by Ralph Goers <Ra...@dslextreme.com>.
I was testing the login page of the portal on my 2.4GHz linux machine. I
tested using JMeter with from 7 to 20 threads. Before the change I was
able to get a throughput of about 3.9 requests/second. After the change
it went to 5.4 requests/second. The regexp is hardcoded in the
EncodeURLTransformer and did not change. The only change I made was to
replace RE with Pattern and the match call to match the JDK 1.4 syntax.
I ran a grep a while ago and found that there was one other place that
used Jakarta regexp. I think it was SourceUtil. I did not change that.
Jakarta regexp is in the lib/endorsed directory. I have no idea why. I
presume some other package we are using requires it.
Ralph
Vadim Gritsenko said:
> rgoers@apache.org wrote:
>> Replace jakarta regexp with java.util.regexp on jdk 1.4 builds for
>> better reliability and improved performance.
>
> So question is, is it faster now? How much faster and on what regexp/data?
>
> Vadim
>
regexp, Re: svn commit: r375161 - in /cocoon/branches/BRANCH_2_1_X:
src/java/org/apache/cocoon/transformation/ src/jdk1.3/ src/jdk1.3/java/ src/jdk1.3/java/org/
src/jdk1.3/java/org/apache/ src/jdk1.3/java/org/apache/cocoon/ src/jdk1.3/java/org/apache/cocoon/transf...
Posted by Vadim Gritsenko <va...@reverycodes.com>.
rgoers@apache.org wrote:
> Replace jakarta regexp with java.util.regexp on jdk 1.4 builds for better reliability and improved performance.
So question is, is it faster now? How much faster and on what regexp/data?
Vadim