You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/10/29 19:45:03 UTC
svn commit: r329454 - in /cocoon/branches/BRANCH_2_1_X/src/blocks/portal:
conf/ java/org/apache/cocoon/portal/coplet/adapter/impl/
java/org/apache/cocoon/portal/impl/ java/org/apache/cocoon/portal/reading/
java/org/apache/cocoon/portal/transformation/ ...
Author: cziegeler
Date: Sat Oct 29 10:44:45 2005
New Revision: 329454
URL: http://svn.apache.org/viewcvs?rev=329454&view=rev
Log:
Switch portal sample back to file based user mgmt (for jdk 1.3)
Fix minor memory leaks and dispose problems
Filter html and body element created by html parser
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/HtmlSaxParser.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/sunrise-user.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf?rev=329454&r1=329453&r2=329454&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf Sat Oct 29 10:44:45 2005
@@ -25,14 +25,16 @@
-->
<component role="org.osoco.cowarp.ApplicationManager"
class="org.osoco.cowarp.impl.StandardApplicationManager"/>
- <!-- This security handler uses OJB and the hsqldb for the authentication: -->
+
+
+ <!-- This security handler makes use of a pipeline for the authentication: -->
<component role="org.osoco.cowarp.SecurityHandler/portal"
- class="org.apache.cocoon.portal.security.DBSecurityHandler"/>
- <!-- If you want to use a pipeline for the authentication use this configuration:
+ class="org.osoco.cowarp.impl.PipelineSecurityHandler">
+ <authentication-resource>cocoon:raw:/sunrise-authuser</authentication-resource>
+ </component>
+ <!-- This security handler uses OJB and the hsqldb for the authentication (JDK 1.4 required):
<component role="org.osoco.cowarp.SecurityHandler/portal"
- class="org.osoco.cowarp.impl.PipelineSecurityHandler">
- <authentication-resource>cocoon:raw:/sunrise-authuser</authentication-resource>
- </component>
+ class="org.apache.cocoon.portal.security.DBSecurityHandler"/>
-->
<component role="org.osoco.cowarp.Application/portal"
class="org.osoco.cowarp.portal.StandardPortalApplication"
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java?rev=329454&r1=329453&r2=329454&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java Sat Oct 29 10:44:45 2005
@@ -191,7 +191,7 @@
final Boolean usePipeline = (Boolean)this.getConfiguration(coplet, "use-pipeline", Boolean.FALSE);
if ( usePipeline.booleanValue() ) {
- HtmlSaxParser.parseString(value, contentHandler);
+ HtmlSaxParser.parseString(value, HtmlSaxParser.getContentFilter(contentHandler));
} else {
// stream out the include for the serializer
IncludingHTMLSerializer.addPortlet(portlet, value);
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java?rev=329454&r1=329453&r2=329454&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java Sat Oct 29 10:44:45 2005
@@ -92,7 +92,6 @@
if ( this.manager != null ) {
this.manager.release(this.portalService);
this.portalService = null;
- this.manager = null;
if ( this.chain != null) {
this.chain.dispose( this.aspectSelector, this.adapterSelector );
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java?rev=329454&r1=329453&r2=329454&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java Sat Oct 29 10:44:45 2005
@@ -97,6 +97,7 @@
public void recycle() {
this.response = null;
this.request = null;
+ this.copletInstanceData = null;
super.recycle();
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java?rev=329454&r1=329453&r2=329454&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java Sat Oct 29 10:44:45 2005
@@ -207,6 +207,7 @@
this.link = null;
this.request = null;
this.parameters = null;
+ this.copletInstanceData = null;
}
/**
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/HtmlSaxParser.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/HtmlSaxParser.java?rev=329454&r1=329453&r2=329454&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/HtmlSaxParser.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/HtmlSaxParser.java Sat Oct 29 10:44:45 2005
@@ -20,8 +20,11 @@
import java.util.Iterator;
import java.util.Properties;
+import org.apache.cocoon.xml.ContentHandlerWrapper;
+import org.apache.excalibur.xml.sax.XMLConsumer;
import org.apache.xerces.parsers.AbstractSAXParser;
import org.cyberneko.html.HTMLConfiguration;
+import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -30,7 +33,7 @@
/**
* This parser uses the nekohtml parser to parse html and generate sax streams.
*
- * @version $Id:$
+ * @version $Id$
*/
public class HtmlSaxParser extends AbstractSAXParser {
@@ -66,6 +69,38 @@
} catch (IOException ioe) {
throw new SAXException("Error during parsing of html markup.", ioe);
}
-
}
+
+ public static XMLConsumer getContentFilter(ContentHandler ch) {
+ return new ContentFilter(ch);
+ }
+
+ protected static final class ContentFilter extends ContentHandlerWrapper {
+
+ public ContentFilter(ContentHandler ch) {
+ this.setContentHandler(ch);
+ if ( ch instanceof LexicalHandler ) {
+ this.setLexicalHandler((LexicalHandler)ch);
+ }
+ }
+
+ /**
+ * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
+ */
+ public void endElement(String uri, String loc, String raw) throws SAXException {
+ if ( !loc.equals("html") && !loc.equals("body") ) {
+ super.endElement(uri, loc, raw);
+ }
+ }
+
+ /**
+ * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
+ */
+ public void startElement(String uri, String loc, String raw, Attributes a) throws SAXException {
+ if ( !loc.equals("html") && !loc.equals("body") ) {
+ super.startElement(uri, loc, raw, a);
+ }
+ }
+ }
+
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java?rev=329454&r1=329453&r2=329454&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java Sat Oct 29 10:44:45 2005
@@ -443,7 +443,7 @@
if ( usesGet ) {
contentHandler = new FormRewritingHandler(contentHandler);
}
- HtmlSaxParser.parseString(content, contentHandler);
+ HtmlSaxParser.parseString(content, HtmlSaxParser.getContentFilter(contentHandler));
} else {
// stream out the include for the serializer
IncludingHTMLSerializer.addPortlet(portletInstanceKey, content);
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/sunrise-user.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/sunrise-user.xml?rev=329454&r1=329453&r2=329454&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/sunrise-user.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/sunrise-user.xml Sat Oct 29 10:44:45 2005
@@ -17,12 +17,7 @@
<!-- $Id$
Description: All portal users
- Note: This file is not used by default! The portal samples store the users
- in the database, so changing this file will have no effect! You can either
- change the authentication configuration to use this file, or add/change
- users in the hsqldb instance.
-->
-
<authentication>
<users>
<user>