cvs commit: cocoon-2.1/src/blocks/slop/java/org/apache/cocoon - New directory
bdelacretaz2003/08/06 05:57:58 cocoon-2.1/src/blocks/slop/java/org/apache/cocoon - New directory
RE: Treeprocessor bug with map:resource and views?
Hi vadim, I'm experiencing the same problem. Views on resources seems to be broken. I will put this in bugzilla. Unico -Original Message- From: Vadim Gritsenko [mailto:[EMAIL PROTECTED] Sent: dinsdag 29 juli 2003 16:03 To: [EMAIL PROTECTED] Hi guys, Check out the samples. Most of them work ok, with the exception of i18n samles -- click on content view or links view and see the results. i18n samples use aggregation and resources in the sitemap with the label on one aggregated part. When this pipeline moved from the resource to the pipelines section everything seems to be working ok. This makes me think that there is a problem with resource handling and view labels in the tree processor. Anybody seen this issue already? Vadim
RE: Fixing blocking bug 9835 for release
Sylvain Wallez wrote: It should be fixed now. The database tutorials seems to run fine, but I'd like people using nested actions in action-sets to test it since I never used that feature Thanks Sylvain! I just added a message to bugzilla that people should test it. Carsten
Re: problem creating a new transformer
Miguel, this type of question is better suited for the user mailing list. Anyhow, in order to help you, it would be useful if you mentioned the Cocoon version you are using. On Tue, 2003-08-05 at 21:55, Miguel Carvalho wrote: Hi, i have sent a previous mail on this subject, but now i'm trying an approach that i'm not being able to get it right... :( And it follows like this, i want to create a new transformer that gets sax events from a XSP Generator created by me (with your precious help ). bellow i will post the XSP code snipped rest of message/ -- Bruno Dumon http://outerthought.org/ Outerthought - Open Source, Java XML Competence Support Center [EMAIL PROTECTED] [EMAIL PROTECTED]
cvs commit: cocoon-2.1/src/blocks/slop/java/org/apache - New directory
bdelacretaz2003/08/06 05:57:58 cocoon-2.1/src/blocks/slop/java/org/apache - New directory
cvs commit: cocoon-2.1 status.xml
bdelacretaz2003/08/07 00:00:24 Modified:.status.xml Log: slop block added Revision ChangesPath 1.108 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- status.xml7 Aug 2003 03:33:00 - 1.107 +++ status.xml7 Aug 2003 07:00:24 - 1.108 @@ -167,6 +167,9 @@ changes release version=@version@ date=@date@ + action dev=BD type=add +slop block added (Simple Line Oriented Parser) + /action action dev=JH type=fix fixes-bug=21931, 22173 due-to=Unico Hommes due-to-email=[EMAIL PROTECTED] LDAPTransformer now handles multiple attribute values.
cvs commit: cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components PortalManager.java
joerg 2003/08/07 10:13:40
Modified:src/java/org/apache/cocoon/components/treeprocessor/sitemap
ActionSetNodeBuilder.java ActionSetNode.java
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components
PortalManager.java
Log:
removed locally unused code
Revision ChangesPath
1.4 +1 -8
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActionSetNodeBuilder.java
Index: ActionSetNodeBuilder.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActionSetNodeBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ActionSetNodeBuilder.java 7 Aug 2003 11:08:06 - 1.3
+++ ActionSetNodeBuilder.java 7 Aug 2003 17:13:39 - 1.4
@@ -50,9 +50,6 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -74,10 +71,6 @@
String actionSetName = config.getAttribute(name);
-// Lists of action types and nodes for each map:act
-List actionNames = new ArrayList();
-List actionNodes = new ArrayList();
-
Configuration[] childrenConfig = config.getChildren();
// Inform other builders that we're in an action-set
this.treeBuilder.setAttribute(IN_ACTION_SET, Boolean.TRUE);
1.3 +1 -8
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActionSetNode.java
Index: ActionSetNode.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ActionSetNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActionSetNode.java7 Aug 2003 08:42:20 - 1.2
+++ ActionSetNode.java7 Aug 2003 17:13:39 - 1.3
@@ -59,8 +59,6 @@
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.SimpleSelectorProcessingNode;
import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.SourceResolver;
/**
*
@@ -101,11 +99,6 @@
* these actions.
*/
public final Map call(Environment env, InvokeContext context, Parameters
params) throws Exception {
-
-// Prepare data needed by the actions
-MapobjectModel= env.getObjectModel();
-Redirector redirector = PipelinesNode.getRedirector(env);
-SourceResolver resolver = getSourceResolver(objectModel);
String cocoonAction = env.getAction();
1.9 +8 -5
cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManager.java
Index: PortalManager.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PortalManager.java30 Jul 2003 10:25:37 - 1.8
+++ PortalManager.java7 Aug 2003 17:13:39 - 1.9
@@ -72,7 +72,6 @@
import org.apache.cocoon.webapps.authentication.AuthenticationManager;
import org.apache.cocoon.webapps.authentication.user.RequestState;
import org.apache.cocoon.webapps.portal.PortalConstants;
-import org.apache.cocoon.webapps.session.ContextManager;
import org.apache.cocoon.webapps.session.MediaManager;
import org.apache.cocoon.webapps.session.components.AbstractSessionComponent;
import org.apache.cocoon.webapps.session.context.SessionContext;
@@ -85,12 +84,17 @@
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceParameters;
import org.apache.excalibur.store.Store;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-
/**
* This is the basis portal component
*
@@ -199,7 +203,6 @@
public void compose(ComponentManager manager)
throws ComponentException {
super.compose( manager );
-ContextManager contextManager
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/acting RequestParamAction.java
joerg 2003/08/07 05:37:04
Modified:src/java/org/apache/cocoon/acting RequestParamAction.java
Log:
code formatting
Revision ChangesPath
1.2 +32 -38
cocoon-2.1/src/java/org/apache/cocoon/acting/RequestParamAction.java
Index: RequestParamAction.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/RequestParamAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestParamAction.java 9 Mar 2003 00:08:39 - 1.1
+++ RequestParamAction.java 7 Aug 2003 12:37:04 - 1.2
@@ -50,20 +50,18 @@
*/
package org.apache.cocoon.acting;
-/*
- * Standard imports
- */
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
+
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* This action makes some request details available to the sitemap via parameter
* substitution.
@@ -125,13 +123,11 @@
public final static String MAP_QUERY = requestQuery;
public final static String MAP_CONTEXTPATH = context;
-public final static String PARAM_PARAMETERS = parameters;
+public final static String PARAM_PARAMETERS = parameters;
public final static String PARAM_DEFAULT_PREFIX = default.;
-
-public Map act( Redirector redirector, SourceResolver resolver, Map
objectModel, String source, Parameters param )
-throws Exception
-{
+public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
+ String source, Parameters param) throws Exception {
Request request = ObjectModelHelper.getRequest(objectModel);
@@ -140,37 +136,35 @@
map.put(MAP_URI, request.getRequestURI());
String query = request.getQueryString();
-if (query != null query.length() 0){
- map.put(MAP_QUERY, ? + query);
-}
-else{
- map.put(MAP_QUERY, );
+if (query != null query.length() 0) {
+map.put(MAP_QUERY, ? + query);
+} else {
+map.put(MAP_QUERY, );
}
map.put(MAP_CONTEXTPATH, request.getContextPath());
-if (true.equalsIgnoreCase(param.getParameter(PARAM_PARAMETERS, null))){
- Enumeration e = request.getParameterNames();
- while(e.hasMoreElements()){
-String name = (String) e.nextElement();
-String value = request.getParameter(name);
-
-if (value != null !map.containsKey(name)){
- map.put(name, value);
+if (true.equalsIgnoreCase(param.getParameter(PARAM_PARAMETERS, null))) {
+Enumeration e = request.getParameterNames();
+while (e.hasMoreElements()) {
+String name = (String)e.nextElement();
+String value = request.getParameter(name);
+
+if (value != null !map.containsKey(name)) {
+map.put(name, value);
+}
}
- }
-
- String[] paramNames = param.getNames();
- for (int i=0; i paramNames.length; i++) {
- if (paramNames[i].startsWith(PARAM_DEFAULT_PREFIX)
-
(request.getParameter(paramNames[i].substring(PARAM_DEFAULT_PREFIX.length())) ==
null)) {
- map.put(paramNames[i].substring(PARAM_DEFAULT_PREFIX.length()),
param.getParameter(paramNames[i]));
- }
- }
-
+String[] paramNames = param.getNames();
+for (int i = 0; i paramNames.length; i++) {
+if (paramNames[i].startsWith(PARAM_DEFAULT_PREFIX)
+
(request.getParameter(paramNames[i].substring(PARAM_DEFAULT_PREFIX.length())) ==
null)) {
+map.put(paramNames[i].substring(PARAM_DEFAULT_PREFIX.length()),
+param.getParameter(paramNames[i]));
+}
+}
}
-
-return(map);
+return (map);
}
+
}
DO NOT REPLY [Bug 22270] - [PATCH] SitemapSource cocoon-view parameter
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22270. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22270 [PATCH] SitemapSource cocoon-view parameter --- Additional Comments From [EMAIL PROTECTED] 2003-08-09 10:03 --- Created an attachment (id=7711) zip containing diffs for SitemapSource.java and EnvironmentWrapper.java files
cvs commit: cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation HTMLGenerator.java
cziegeler2003/08/09 11:21:49
Modified:.status.xml
src/java/org/apache/cocoon/environment/wrapper
EnvironmentWrapper.java
src/java/org/apache/cocoon/components/source/impl
SitemapSource.java
src/blocks/html/java/org/apache/cocoon/generation
HTMLGenerator.java
Log:
action dev=CZ type=add fixes-bug=22270 due-to=Unico Hommes
due-to-email=[EMAIL PROTECTED]
Patch for allowing to specify a cocoon-view for internal requests in the query
string.
/action
Revision ChangesPath
1.112 +5 -2 cocoon-2.1/status.xml
Index: status.xml
===
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- status.xml7 Aug 2003 16:54:16 - 1.111
+++ status.xml9 Aug 2003 18:21:49 - 1.112
@@ -167,6 +167,9 @@
changes
release version=@version@ date=@date@
+ action dev=CZ type=add fixes-bug=22270 due-to=Unico Hommes
due-to-email=[EMAIL PROTECTED]
+ Patch for allowing to specify a cocoon-view for internal requests in the query
string.
+ /action
action dev=JH type=fix fixes-bug=19839
Instrumentation support: Updated client libraries to make instrumentation work
again.
Added a target start-instrumentation-client to Cocoon's ant files and removed
runclient shell scripts.
@@ -174,7 +177,7 @@
action dev=JH type=fix fixes-bug=22064 due-to=Nicolas Maisonneuve
due-to-email=[EMAIL PROTECTED]
XMLDBTransformer: retrieving auto-generated resource id.
/action
- action dev=BD type=add due-to=Mark Leicester due-to.email=[EMAIL
PROTECTED]
+ action dev=BD type=add due-to=Mark Leicester due-to-email=[EMAIL
PROTECTED]
midi block added
/action
action dev=BD type=add
1.10 +17 -2
cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Index: EnvironmentWrapper.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- EnvironmentWrapper.java 4 Aug 2003 03:21:51 - 1.9
+++ EnvironmentWrapper.java 9 Aug 2003 18:21:49 - 1.10
@@ -139,7 +139,22 @@
ComponentManager manager,
boolean rawMode)
throws MalformedURLException {
-super(env.getURI(), env.getView(), env.getContext(), env.getAction());
+this(env, requestURI, queryString, logger, null, rawMode,env.getView());
+}
+
+/**
+ * Constructs an EnvironmentWrapper object from a Request
+ * and Response objects
+ */
+public EnvironmentWrapper(Environment env,
+ String requestURI,
+ String queryString,
+ Logger logger,
+ ComponentManager manager,
+ boolean rawMode,
+ String view)
+throws MalformedURLException {
+super(env.getURI(), view, env.getContext(), env.getAction());
this.rootContext = env.getRootContext();
this.enableLogging(logger);
1.9 +26 -2
cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
Index: SitemapSource.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SitemapSource.java6 Jul 2003 11:44:30 - 1.8
+++ SitemapSource.java9 Aug 2003 18:21:49 - 1.9
@@ -54,6 +54,7 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.cocoon.Constants;
import org.apache.cocoon.Processor;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.components.CocoonComponentManager;
@@ -201,6 +202,29 @@
uri = uri.substring(position);
}
this.uri = uri;
+
+// determine if the queryString specifies a cocoon-view
+String view = null;
+if (queryString != null) {
+int index = queryString.indexOf(Constants.VIEW_PARAM);
+if (index != -1
+ (index == 0 || queryString.charAt(index-1) == '')
+
cvs commit: cocoon-2.1 status.xml
joerg 2003/08/07 06:37:23 Modified:.status.xml Log: fixing bug 22064 (thanks to Nicolas Maisonneuve): retrieving auto-generated resource id Revision ChangesPath 1.110 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- status.xml7 Aug 2003 07:27:01 - 1.109 +++ status.xml7 Aug 2003 13:37:23 - 1.110 @@ -167,6 +167,9 @@ changes release version=@version@ date=@date@ + action dev=JH type=fix due-to=Nicolas Maisonneuve due-to-email=[EMAIL PROTECTED] +XMLDBTransformer: retrieving auto-generated resource id. + /action action dev=BD type=add due-to=Mark Leicester due-to.email=[EMAIL PROTECTED] midi block added /action
