cvs commit: cocoon-2.1 gump.xml
joerg 2004/03/10 16:12:11 Modified:.gump.xml Log: woody is deprecated Revision ChangesPath 1.124 +2 -2 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- gump.xml 10 Mar 2004 14:39:52 - 1.123 +++ gump.xml 11 Mar 2004 00:12:11 - 1.124 @@ -764,7 +764,7 @@ nag from=Gump to=dev@cocoon.apache.org/ /project - project name=cocoon-block-woody status=unstable + project name=cocoon-block-woody status=deprecated packageorg.apache.cocoon/package ant target=gump-block
cvs commit: cocoon-2.1 blocks.properties
joerg 2004/03/10 16:18:19 Modified:.blocks.properties Log: for the case it got forgotten: we don't need the blocks.properties maintain by hand, just try build generate-blocks.properties and it has the latest stati and dependencies from gump.xml Revision ChangesPath 1.65 +10 -6 cocoon-2.1/blocks.properties Index: blocks.properties === RCS file: /home/cvs/cocoon-2.1/blocks.properties,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- blocks.properties 10 Mar 2004 14:39:52 - 1.64 +++ blocks.properties 11 Mar 2004 00:18:19 - 1.65 @@ -1,3 +1,4 @@ + # Copyright 1999-2004 The Apache Software Foundation # # Licensed under the Apache License, Version 2.0 (the License); @@ -12,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # + #--# # Cocoon Blocks # #--# @@ -64,7 +66,9 @@ #-[dependency]: portal-fw depends on authentication-fw, session-fw. #exclude.block.portal-fw=true #exclude.block.profiler=true +#-[dependency]: python depends on xsp. #exclude.block.python=true +#-[dependency]: session-fw depends on xsp. #-[dependency]: session-fw is needed by authentication-fw, portal, portal-fw. #exclude.block.session-fw=true #exclude.block.swf=true @@ -73,6 +77,7 @@ #exclude.block.web3=true #-[dependency]: xmldb depends on databases. #exclude.block.xmldb=true +#-[dependency]: xsp is needed by python, scratchpad, session-fw. #exclude.block.xsp=true # Unstable blocks -- @@ -95,18 +100,18 @@ #exclude.block.deli=true #-[dependency]: eventcache is needed by jms, repository, slide. #exclude.block.eventcache=true +#-[dependency]: forms is needed by apples, petstore. +#exclude.block.forms=true #-[dependency]: jms depends on databases, eventcache, hsqldb. #-[dependency]: jms is needed by slide. #exclude.block.jms=true -#-[dependency]: forms is needed by apples, petstore. -#exclude.block.forms=true #exclude.block.linotype=true #-[dependency]: mail depends on asciiart. #exclude.block.mail=true #exclude.block.midi=true #-[dependency]: ojb depends on databases. #exclude.block.ojb=true -#-[dependency]: petstore depends on databases, hsqldb, velocity, forms. +#-[dependency]: petstore depends on databases, forms, hsqldb, velocity. #exclude.block.petstore=true #-[dependency]: portal depends on authentication-fw, html, session-fw. #exclude.block.portal=true @@ -115,7 +120,7 @@ #-[dependency]: repository depends on databases, eventcache. #-[dependency]: repository is needed by slide, webdav. #exclude.block.repository=true -#-[dependency]: scratchpad depends on batik, cron, velocity. +#-[dependency]: scratchpad depends on batik, cron, velocity, xsp. #exclude.block.scratchpad=true #-[dependency]: slide depends on eventcache, jms, repository. #exclude.block.slide=true @@ -125,11 +130,10 @@ #-[dependency]: webdav depends on repository. #exclude.block.webdav=true - # Deprecated blocks # Although some of these blocks may have been stable, they are now deprecated # in favour of other blocks and therefore are excluded by default from the build -exclude.block.xmlform=true exclude.block.woody=true +exclude.block.xmlform=true
cvs commit: cocoon-2.1/src/blocks/forms/samples/forms/xsl carfilter.xsl
joerg 2004/03/10 16:54:32 Removed: src/blocks/forms/samples/forms/forms form1.xml registration.xml registration_success_jx.xml countryselector_success.xsp countryselector_form.xml form2_data-result.xml form1_template_action.xml upload_model.xml form_model_gui_success.xsp upload_success_jx.xml car-db.xml form_model_gui_model.xml a-choices.xml htmlarea_success.jx form2_bind_bean.xml countryselector_template.xml carselector_success.xsp form2_model.xml registration_template.xml form2_bind_xml.xml form2_template.xml form_model_gui_binding.xml form2_jx.xml upload_template.xml form1_template.xml carselector_template.xml form_model_gui_data.xml customvalidationdemo_template.xml htmlarea_template.xml form2_data.xml customvalidationdemo_form.xml form_model_gui_template.xml form1_success.xsp htmlarea.xml carselector_form.xml src/blocks/forms/samples/forms/resources/htmlarea/plugins/TableOperations/img col-insert-after.gif cell-merge.gif row-insert-above.gif cell-split.gif table-prop.gif row-prop.gif col-split.gif makefile.xml cell-delete.gif row-delete.gif cell-insert-after.gif cell-insert-before.gif row-insert-under.gif col-delete.gif col-insert-before.gif cell-prop.gif row-split.gif src/blocks/forms/samples/forms/resources delete.gif forms-lib.js def2binding.xsl move_up.gif forms-calendar.css forms-advanced-field-styling.xsl forms-samples-styling.xsl help.gif new.gif forms-field-styling.xsl cal.gif mattkruse-lib.js move_down.gif forms-page-styling.xsl forms-calendar-styling.xsl forms-htmlarea-styling.xsl forms.css src/blocks/forms/samples/forms/resources/htmlarea/popups editor_help.html custom2.html makefile.xml fullscreen.html link.html about.html popup.js insert_image.html select_color.html blank.html old-fullscreen.html insert_table.html old_insert_image.html src/blocks/forms/samples/forms/messages OtherMessages_fr.xml OtherMessages.xml FormsMessages.xml FormsMessages_fr.xml FormsMessages_it_IT.xml OtherMessages_it_IT.xml src/blocks/forms/samples/forms/resources/htmlarea/images ed_blank.gif ed_cut.gif ed_custom.gif ed_format_sup.gif ed_splitcel.gif ed_image.gif ed_align_justify.gif ed_help.gif ed_list_bullet.gif ed_undo.gif ed_link.gif ed_color_fg.gif insert_table.gif ed_format_sub.gif ed_align_right.gif ed_align_center.gif ed_format_underline.gif ed_right_to_left.gif ed_about.gif ed_copy.gif ed_redo.gif fullscreen_maximize.gif ed_charmap.gif ed_hr.gif ed_show_border.gif ed_format_strike.gif ed_delete.gif ed_color_bg.gif makefile.xml ed_indent_less.gif ed_align_left.gif ed_format_italic.gif fullscreen_minimize.gif ed_paste.gif ed_format_bold.gif ed_list_num.gif ed_left_to_right.gif ed_indent_more.gif ed_html.gif ed_save.gif ed_save.png src/blocks/forms/samples/forms/resources/htmlarea/lang ja-euc.js pt_br.js nl.js vn.js se.js da.js hu.js el.js fi.js ja-utf8.js ja-jis.js cz.js es.js ru.js it.js de.js no.js lt.js b5.js si.js makefile.xml lv.js ro.js ja-sjis.js ee.js nb.js gb.js pl.js he.js fr.js en.js src/blocks/forms/samples/forms/resources/htmlarea/plugins/FullPage full-page.js test.html makefile.xml src/blocks/forms/samples/forms/resources/htmlarea release-notes.html ChangeLog dialog.js htmlarea.css .project make-release.pl index.html makefile.xml reference.html htmlarea.js popupdiv.js popupwin.js project-config.xml
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap PipelineNode.java
joerg 2004/03/10 17:31:59 Modified:src/java/org/apache/cocoon/components/treeprocessor/sitemap PipelineNode.java Log: imports Revision ChangesPath 1.14 +1 -2 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java Index: PipelineNode.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- PipelineNode.java 10 Mar 2004 23:37:31 - 1.13 +++ PipelineNode.java 11 Mar 2004 01:31:59 - 1.14 @@ -19,7 +19,6 @@ import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; -import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.logger.Logger; import org.apache.cocoon.ConnectionResetException; import org.apache.cocoon.ResourceNotFoundException;
cvs commit: cocoon-2.1/tools/src gump2blocks.properties.xsl
joerg 2004/03/10 18:52:12
Modified:tools/src gump2blocks.properties.xsl
Log:
add the license to the generated blocks.properties
Revision ChangesPath
1.4 +18 -0 cocoon-2.1/tools/src/gump2blocks.properties.xsl
Index: gump2blocks.properties.xsl
===
RCS file: /home/cvs/cocoon-2.1/tools/src/gump2blocks.properties.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gump2blocks.properties.xsl8 Mar 2004 06:07:15 - 1.3
+++ gump2blocks.properties.xsl11 Mar 2004 02:52:12 - 1.4
@@ -24,6 +24,23 @@
desc:descs
+desc:desc name=license
+# 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.
+#
+/desc:desc
+
desc:desc name=common
#--#
# Cocoon Blocks
#
@@ -76,6 +93,7 @@
/desc:descs
xsl:template match=/module
+xsl:value-of select=document('')/xsl:stylesheet/desc:descs/desc:[EMAIL
PROTECTED] = 'license']/
xsl:value-of select=document('')/xsl:stylesheet/desc:descs/desc:[EMAIL
PROTECTED] = 'common']/
xsl:apply-templates
select=project[starts-with(@name, 'cocoon-block-')]
cvs commit: cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/generation FormGenerator.java FormsGenerator.java
joerg 2004/03/10 18:56:33 Modified:src/blocks/forms/samples/resources forms-page-styling.xsl forms-calendar-styling.xsl forms.css forms-samples-styling.xsl forms-advanced-field-styling.xsl forms-field-styling.xsl forms-htmlarea-styling.xsl def2binding.xsl src/blocks/forms/samples/v2 carselector_template.xml forms_flow_example.js sitemap.xmap src/blocks/forms/java/org/apache/cocoon/forms/binding UniqueFieldJXPathBinding.java ValueJXPathBinding.java ContextJXPathBinding.java Binding.java ComposedJXPathBindingBase.java JXPathBindingManager.java src/blocks/forms/test/org/apache/cocoon/forms/datatype FlowJXPathSelectionListTestCase.xtest DynamicSelectionListTestCase.xtest EnumSelectionListTestCase.xtest FlowJXPathSelectionListTestCase.java EnumSelectionListTestCase.java DynamicSelectionListTestCase.java src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor EnumConvertorBuilder.java ConvertorBuilder.java src/blocks/forms/java/org/apache/cocoon/forms/util DomHelper.java JavaScriptHelper.java src/blocks/forms/samples/forms carselector_template.xml form2_template.xml countryselector_template.xml src/blocks/forms/java/org/apache/cocoon/forms/transformation EffectWidgetReplacingPipe.java WidgetReplacingPipe.java src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript ScriptableWidget.java src/blocks/forms/java/org/apache/cocoon/forms/samples InitForm1Action.java src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript/v2 Form.js ScriptableWidget.java src/blocks/forms/samples/aggregate sitemap.xmap example.js src/blocks/forms/java/org/apache/cocoon/forms/formmodel Widget.java Form.java WidgetDefinition.java Upload.java tools/targets upgrade-build.xml src/blocks/forms/samples/flow upload_example.js customvalidationdemo.js forms_flow_example.js bindings.js htmlarea.js binding_example.js form_model_gui.js registration.js src/blocks/forms/java/org/apache/cocoon/forms DefaultFormManager.java CacheManager.java src/blocks/forms/samples/xsl/html forms-default.xsl src/blocks/forms/samples/forms/binding 01value-bind.xml src/blocks/forms/java/org/apache/cocoon/forms/acting HandleFormSubmitAction.java src/blocks/forms/samples sitemap.xmap Added: src/blocks/forms/samples/messages FormMessages.xml FormMessages_fr.xml FormMessages_it_IT.xml src/blocks/forms/java/org/apache/cocoon/forms/transformation FormPipelineConfig.java FormTemplateTransformer.java src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript FormFlowHelper.java Form.js Form.java src/blocks/forms/java/org/apache/cocoon/forms/acting AbstractFormAction.java src/blocks/forms/java/org/apache/cocoon/forms/generation FormGenerator.java Removed: src/blocks/forms/samples/messages FormsMessages_fr.xml FormsMessages.xml FormsMessages_it_IT.xml src/blocks/forms/java/org/apache/cocoon/forms/transformation FormsTemplateTransformer.java FormsPipelineConfig.java src/blocks/forms/java/org/apache/cocoon/forms/flow/javascript forms.js FormsFlowHelper.java Forms.java src/blocks/forms/java/org/apache/cocoon/forms/acting AbstractFormsAction.java src/blocks/forms/java/org/apache/cocoon/forms/generation FormsGenerator.java Log: kick *all* references on woody, esp. woody-form and so on; for consistency (not only) in class names Form instead of Forms, otherwise HandleFormSubmitAction, but AbstractFormsAction; o.a.c.forms.datatype.ValidationError has been removed (broken sample fixed); ... I don't what else more, at least all samples work again besides those using FormGenerator. Revision ChangesPath 1.3
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/acting PropagatorAction.java
cziegeler2004/03/11 01:14:32
Modified:src/java/org/apache/cocoon/bean CocoonBean.java
Added: src/java/org/apache/cocoon/util NullOutputStream.java
src/java/org/apache/cocoon/acting PropagatorAction.java
Removed: src/java/org/apache/cocoon/servlet
ParanoidCocoonServlet.java BootstrapServlet.java
ParanoidClassLoader.java
Log:
Remove classes from paranoid block
Add two classes from 2.1 that were missing
Revision ChangesPath
1.1
cocoon-2.2/src/java/org/apache/cocoon/util/NullOutputStream.java
Index: NullOutputStream.java
===
/*
* 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.util;
import java.io.OutputStream;
/**
* @author a href=http://apache.org/~reinhard;Reinhard Poetz/a
* @version CVS $Id: NullOutputStream.java,v 1.1 2004/03/11 09:14:32
cziegeler Exp $
*
* @since 2.1.4
*/
public final class NullOutputStream extends OutputStream {
public void write(byte b[]) {
}
public void write(byte b[], int off, int len) {
}
public void write(int b) {
}
}
1.52 +0 -1
cocoon-2.2/src/java/org/apache/cocoon/bean/CocoonBean.java
Index: CocoonBean.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/bean/CocoonBean.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- CocoonBean.java 10 Mar 2004 17:58:04 - 1.51
+++ CocoonBean.java 11 Mar 2004 09:14:32 - 1.52
@@ -34,7 +34,6 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.ModifiableProcessor;
-import org.apache.cocoon.Processor;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.container.CocoonContainer;
import org.apache.cocoon.components.container.ComponentContext;
1.1
cocoon-2.2/src/java/org/apache/cocoon/acting/PropagatorAction.java
Index: PropagatorAction.java
===
/*
* 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.acting;
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.avalon.framework.service.ServiceSelector;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.modules.output.OutputModule;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
/**
* This is the action used to propagate parameters into a store using an
* [EMAIL PROTECTED]
org.apache.cocoon.components.modules.output.OutputModule}. It
* simply propagates given expression. Additionaly it will make all
propagated values
* available via returned Map.
*
* pExample configuration:/p
* pre
* lt;map:action type= name= logger=...gt;
* lt;output-module name=session-attrgt;
* lt;!-- optional configuration for output module --gt;
* lt;/output-modulegt;
* lt;store-empty-parametersgt;truelt;/store-empty-parametersgt;
* lt;defaultsgt;
* lt;default
cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation HTMLEventLinkTransformer.java
cziegeler2004/03/11 01:44:02
Modified:src/blocks/portal/java/org/apache/cocoon/portal/transformation
HTMLEventLinkTransformer.java
Log:
Fix bug
Revision ChangesPath
1.3 +2 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java
Index: HTMLEventLinkTransformer.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTMLEventLinkTransformer.java 5 Mar 2004 13:02:16 - 1.2
+++ HTMLEventLinkTransformer.java 11 Mar 2004 09:44:02 - 1.3
@@ -79,7 +79,7 @@
*/
public void endElement(String uri, String name, String raw)
throws SAXException {
-if ( a.equals(name) || form.equals(name) ) {
+if ( a.equals(name) || form.equals(name) ) {
this.xmlConsumer.endElement(CopletTransformer.NAMESPACE_URI,
CopletTransformer.LINK_ELEM,
coplet: +
CopletTransformer.LINK_ELEM);
cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portlet CocoonPortlet.java
cziegeler2004/03/11 01:56:47 Modified:.status.xml src/blocks/portal/java/org/apache/cocoon/portlet CocoonPortlet.java Log: action dev=CZ type=update fixes-bug=27188 due-to-email=[EMAIL PROTECTED] Set the default encoding for the Portlet Environment. /action Revision ChangesPath 1.273 +4 -1 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- status.xml10 Mar 2004 12:58:03 - 1.272 +++ status.xml11 Mar 2004 09:56:47 - 1.273 @@ -210,6 +210,9 @@ changes release version=@version@ date=@date@ + action dev=CZ type=update fixes-bug=27188 due-to-email=[EMAIL PROTECTED] + Set the default encoding for the Portlet Environment. + /action action dev=SMS type=update Move XSP into an own block. /action 1.3 +2 -1 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java Index: CocoonPortlet.java === RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CocoonPortlet.java5 Mar 2004 13:02:17 - 1.2 +++ CocoonPortlet.java11 Mar 2004 09:56:47 - 1.3 @@ -460,6 +460,7 @@ this.containerEncoding = getInitParameter(container-encoding, ISO-8859-1); this.defaultFormEncoding = getInitParameter(form-encoding, ISO-8859-1); +this.appContext.put(Constants.CONTEXT_DEFAULT_ENCODING, this.defaultFormEncoding); this.manageExceptions = getInitParameterAsBoolean(manage-exceptions, true); this.enableInstrumentation = getInitParameterAsBoolean(enable-instrumentation, false);
cvs commit: cocoon-2.1/src/blocks/forms/samples sitemap.xmap
stephan 2004/03/11 03:23:37 Modified:src/blocks/forms/samples sitemap.xmap Added: src/blocks/forms/conf forms-generator.xmap forms-transformator.xmap Log: Move generator and transformer declarations into patch files, to make them available to other blocks. Revision ChangesPath 1.1 cocoon-2.1/src/blocks/forms/conf/forms-generator.xmap Index: forms-generator.xmap === ?xml version=1.0? !-- 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. -- xmap xpath=/sitemap/components/generators unless=[EMAIL PROTECTED]'form'] map:generator name=form logger=forms src=org.apache.cocoon.forms.generation.FormGenerator/ /xmap 1.1 cocoon-2.1/src/blocks/forms/conf/forms-transformator.xmap Index: forms-transformator.xmap === ?xml version=1.0? !-- 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. -- xmap xpath=/sitemap/components/transformers unless=[EMAIL PROTECTED]'form'] map:transformer name=form logger=forms src=org.apache.cocoon.forms.transformation.FormTemplateTransformer/ /xmap 1.3 +0 -10 cocoon-2.1/src/blocks/forms/samples/sitemap.xmap Index: sitemap.xmap === RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/samples/sitemap.xmap,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sitemap.xmap 11 Mar 2004 02:56:33 - 1.2 +++ sitemap.xmap 11 Mar 2004 11:23:36 - 1.3 @@ -19,13 +19,7 @@ map:components - map:generators default=file -map:generator name=form src=org.apache.cocoon.forms.generation.FormGenerator logger=forms/ -map:generator name=jx src=org.apache.cocoon.generation.JXTemplateGenerator label=content logger=sitemap.generator.jx/ - /map:generators - map:transformers default=xalan -map:transformer name=form src=org.apache.cocoon.forms.transformation.FormTemplateTransformer logger=forms/ map:transformer name=i18n src=org.apache.cocoon.transformation.I18nTransformer catalogues default=forms catalogue id=other name=OtherMessages location=messages/ @@ -44,10 +38,6 @@ map:action name=init-form src=org.apache.cocoon.forms.samples.InitForm1Action logger=forms/ map:action name=handle-form-submit src=org.apache.cocoon.forms.acting.HandleFormSubmitAction logger=forms/ /map:actions - - map:pipes default=caching - /map:pipes - /map:components map:views
cvs commit: cocoon-2.1/tools/src gump2blocks.properties.xsl
bdelacretaz2004/03/11 06:12:08 Modified:.blocks.properties tools/src gump2blocks.properties.xsl Log: indicate that blocks.properties is generated from gump.xml Revision ChangesPath 1.66 +4 -0 cocoon-2.1/blocks.properties Index: blocks.properties === RCS file: /home/cvs/cocoon-2.1/blocks.properties,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- blocks.properties 11 Mar 2004 00:18:19 - 1.65 +++ blocks.properties 11 Mar 2004 14:12:08 - 1.66 @@ -29,6 +29,10 @@ # Disabling batik, for example, will result in a RuntimeException when using # fop. On the other hand some dependencies come only from the block samples. +# NOTE: (to Cocoon committers): blocks.properties is generated from gump.xml +# using build generate-blocks.properties. Any changes to blocks definitions +# must be made in gump.xml, not here. + # Stable blocks 1.5 +5 -0 cocoon-2.1/tools/src/gump2blocks.properties.xsl Index: gump2blocks.properties.xsl === RCS file: /home/cvs/cocoon-2.1/tools/src/gump2blocks.properties.xsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gump2blocks.properties.xsl11 Mar 2004 02:52:12 - 1.4 +++ gump2blocks.properties.xsl11 Mar 2004 14:12:08 - 1.5 @@ -17,6 +17,7 @@ xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform; xmlns:desc=description +!-- generates blocks.properties from gump.xml -- xsl:output method=text/ xsl:key name=status match=project[starts-with(@name, 'cocoon-block-')] use=@status/ @@ -56,6 +57,10 @@ # NOTE: [dependency] indicates blocks that are required by other blocks. # Disabling batik, for example, will result in a RuntimeException when using # fop. On the other hand some dependencies come only from the block samples. + +# NOTE: (to Cocoon committers): blocks.properties is generated from gump.xml +# using build generate-blocks.properties. Any changes to blocks definitions +# must be made in gump.xml, not here. /desc:desc
cvs commit: cocoon-2.1/tools/relicense check-diffs.sh
bdelacretaz2004/03/11 06:18:53 Removed: tools/relicense check-diffs.sh Log: relicense diff script is not needed anymore
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/reading ResourceReader.java ImageReader.java
cziegeler2004/03/11 06:52:04
Modified:src/java/org/apache/cocoon/reading ResourceReader.java
ImageReader.java
Log:
Changing internal redirect to a forward
Add new sitemap parameter handling
Revision ChangesPath
1.8 +3 -3
cocoon-2.2/src/java/org/apache/cocoon/reading/ResourceReader.java
Index: ResourceReader.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/reading/ResourceReader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ResourceReader.java 8 Mar 2004 14:03:32 - 1.7
+++ ResourceReader.java 11 Mar 2004 14:52:04 - 1.8
@@ -266,12 +266,12 @@
else {
response.addHeader(Vary, Host);
}
-
+
long lastModified = getLastModified();
if (lastModified 0) {
response.setDateHeader(Last-Modified, lastModified);
}
-
+
try {
inputStream = inputSource.getInputStream();
}
1.7 +25 -25
cocoon-2.2/src/java/org/apache/cocoon/reading/ImageReader.java
Index: ImageReader.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/reading/ImageReader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ImageReader.java 8 Mar 2004 23:34:12 - 1.6
+++ ImageReader.java 11 Mar 2004 14:52:04 - 1.7
@@ -56,17 +56,17 @@
* /dd
* dtlt;scale(Red|Green|Blue)gt;/dt
* ddThis parameter is optional. When specified it will cause the
- * specified color component in the image to be multiplied by the
- * specified floating point value.
+ * specified color component in the image to be multiplied by the
+ * specified floating point value.
* /dd
* dtlt;offset(Red|Green|Blue)gt;/dt
* ddThis parameter is optional. When specified it will cause the
- * specified color component in the image to be incremented by the
- * specified floating point value.
+ * specified color component in the image to be incremented by the
+ * specified floating point value.
* /dd
* dtlt;grayscalegt;/dt
* ddThis parameter is optional. When specified and set to true it
- * will cause each image pixel to be normalized.
+ * will cause each image pixel to be normalized.
* /dd
* /dl
*
@@ -105,7 +105,7 @@
scaleColor[2] = par.getParameterAsFloat(scaleBlue, -1.0f);
offsetColor[0] = par.getParameterAsFloat(offsetRed, 0.0f);
offsetColor[1] = par.getParameterAsFloat(offsetGreen, 0.0f);
-offsetColor[2] = par.getParameterAsFloat(offsetBlue, 0.0f);
+offsetColor[2] = par.getParameterAsFloat(offsetBlue, 0.0f);
boolean filterColor = false;
@@ -131,8 +131,8 @@
grayscaleFilter = new
ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY), null);
} else {
grayscaleFilter = null;
-}
-
+}
+
String enlargePar = par.getParameter(allow-enlarging,
ENLARGE_DEFAULT);
if (true.equalsIgnoreCase(enlargePar) ||
yes.equalsIgnoreCase(enlargePar)){
enlarge = true;
@@ -219,28 +219,28 @@
try {
JPEGImageDecoder decoder =
JPEGCodec.createJPEGDecoder(inputStream);
BufferedImage original = decoder.decodeAsBufferedImage();
-BufferedImage currentImage = original;
+ BufferedImage currentImage = original;
-if (width 0 || height 0) {
-JPEGDecodeParam decodeParam =
decoder.getJPEGDecodeParam();
-double ow = decodeParam.getWidth();
-double oh = decodeParam.getHeight();
+ if (width 0 || height 0) {
+ JPEGDecodeParam decodeParam =
decoder.getJPEGDecodeParam();
+ double ow = decodeParam.getWidth();
+ double oh = decodeParam.getHeight();
-AffineTransformOp filter = new
AffineTransformOp(getTransform(ow, oh, width, height),
AffineTransformOp.TYPE_BILINEAR);
-WritableRaster scaledRaster =
filter.createCompatibleDestRaster(currentImage.getRaster());
+ AffineTransformOp filter = new
AffineTransformOp(getTransform(ow, oh, width, height),
AffineTransformOp.TYPE_BILINEAR);
+ WritableRaster scaledRaster =
filter.createCompatibleDestRaster(currentImage.getRaster());
-filter.filter(currentImage.getRaster(), scaledRaster);
+
cvs commit: cocoon-2.1/tools/src/anttasks XConfToolTask.java
stephan 2004/03/11 07:11:10
Modified:tools/src/anttasks XConfToolTask.java
Log:
Retry to apply patches, which depends on each other.
Revision ChangesPath
1.18 +62 -20cocoon-2.1/tools/src/anttasks/XConfToolTask.java
Index: XConfToolTask.java
===
RCS file: /home/cvs/cocoon-2.1/tools/src/anttasks/XConfToolTask.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XConfToolTask.java10 Mar 2004 13:33:03 - 1.17
+++ XConfToolTask.java11 Mar 2004 15:11:10 - 1.18
@@ -41,6 +41,8 @@
import java.io.File;
import java.io.IOException;
import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Iterator;
/**
* Ant task to patch xmlfiles.
@@ -74,6 +76,9 @@
private boolean addComments;
/** for resolving entities such as dtds */
private XMLCatalog xmlCatalog = new XMLCatalog();
+ private DocumentBuilderFactory builderFactory;
+private DocumentBuilder builder;
+private Transformer transformer;
/**
* Set file, which should be patched.
@@ -126,15 +131,15 @@
throw new BuildException(file attribute is required, location);
}
try {
-final DocumentBuilderFactory builderFactory =
DocumentBuilderFactory.newInstance();
+builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setValidating(false);
builderFactory.setExpandEntityReferences(false);
builderFactory.setNamespaceAware(false);
builderFactory.setAttribute(
http://apache.org/xml/features/nonvalidating/load-external-dtd;,
Boolean.FALSE);
-final DocumentBuilder builder =
builderFactory.newDocumentBuilder();
-final Transformer transformer =
TransformerFactory.newInstance().newTransformer();
+builder = builderFactory.newDocumentBuilder();
+transformer = TransformerFactory.newInstance().newTransformer();
// load xml
log(Reading: + this.file, Project.MSG_DEBUG);
@@ -149,18 +154,52 @@
boolean hasChanged = false;
// process recursive
File patchfile;
+ ArrayList suspended = new
ArrayList();
for (int i = 0; i list.length; i++) {
patchfile = new File(this.srcdir, list[i]);
try {
// Adds configuration snippet from the file to the
configuration
-hasChanged |= patch(document,
-
builder.parse(patchfile.toURL().toExternalForm()),
-patchfile.toString());
+
boolean changed = patch(document, patchfile);
+hasChanged |= changed;
+
if (!changed) {
+
suspended.add(patchfile);
+
}
} catch (SAXException e) {
log(Ignoring: +patchfile+\n(not a valid XML));
}
}
+ if (hasChanged
!suspended.isEmpty()) {
+ log(Try to apply suspended
patch files);
+ }
+
+ ArrayList newSuspended = new
ArrayList();
+ while (hasChanged
!suspended.isEmpty()) {
+ hasChanged = false;
+ for(Iterator
i=suspended.iterator(); i.hasNext();) {
+
patchfile = (File)i.next();
+ try {
+
// Adds configuration snippet from the file to the configuration
+
boolean changed = patch(document, patchfile);
+ hasChanged |= changed;
+ if (!changed) {
+newSuspended.add(patchfile);
+ }
+ } catch (SAXException e) {
+
cvs commit: cocoon-2.1/tools/src/anttasks XConfToolTask.java
stephan 2004/03/11 07:13:02
Modified:tools/src/anttasks XConfToolTask.java
Log:
Replace tab by two spaces.
Revision ChangesPath
1.19 +39 -39cocoon-2.1/tools/src/anttasks/XConfToolTask.java
Index: XConfToolTask.java
===
RCS file: /home/cvs/cocoon-2.1/tools/src/anttasks/XConfToolTask.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XConfToolTask.java11 Mar 2004 15:11:10 - 1.18
+++ XConfToolTask.java11 Mar 2004 15:13:02 - 1.19
@@ -76,7 +76,7 @@
private boolean addComments;
/** for resolving entities such as dtds */
private XMLCatalog xmlCatalog = new XMLCatalog();
- private DocumentBuilderFactory builderFactory;
+private DocumentBuilderFactory builderFactory;
private DocumentBuilder builder;
private Transformer transformer;
@@ -154,51 +154,51 @@
boolean hasChanged = false;
// process recursive
File patchfile;
- ArrayList suspended = new
ArrayList();
+ArrayList suspended = new ArrayList();
for (int i = 0; i list.length; i++) {
patchfile = new File(this.srcdir, list[i]);
try {
// Adds configuration snippet from the file to the
configuration
-
boolean changed = patch(document, patchfile);
+boolean changed = patch(document, patchfile);
hasChanged |= changed;
-
if (!changed) {
-
suspended.add(patchfile);
-
}
+if (!changed) {
+suspended.add(patchfile);
+}
} catch (SAXException e) {
log(Ignoring: +patchfile+\n(not a valid XML));
}
}
- if (hasChanged
!suspended.isEmpty()) {
- log(Try to apply suspended
patch files);
- }
-
- ArrayList newSuspended = new
ArrayList();
- while (hasChanged
!suspended.isEmpty()) {
- hasChanged = false;
- for(Iterator
i=suspended.iterator(); i.hasNext();) {
-
patchfile = (File)i.next();
- try {
-
// Adds configuration snippet from the file to the configuration
-
boolean changed = patch(document, patchfile);
- hasChanged |= changed;
- if (!changed) {
+if (hasChanged !suspended.isEmpty()) {
+log(Try to apply suspended patch files);
+}
+
+ArrayList newSuspended = new ArrayList();
+while (hasChanged !suspended.isEmpty()) {
+hasChanged = false;
+for(Iterator i=suspended.iterator(); i.hasNext();) {
+patchfile = (File)i.next();
+try {
+ // Adds configuration snippet from the file to the
configuration
+boolean changed = patch(document, patchfile);
+hasChanged |= changed;
+if (!changed) {
newSuspended.add(patchfile);
- }
- } catch (SAXException e) {
-
log(Ignoring: +patchfile+\n(not a valid XML));
-
}
- }
- suspended = newSuspended;
- newSuspended =
new ArrayList();
- }
+}
+} catch (SAXException e) {
+log(Ignoring: +patchfile+\n(not a valid XML));
+
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart MultipartParser.java
sylvain 2004/03/11 07:32:41
Modified:src/java/org/apache/cocoon/servlet/multipart
MultipartParser.java
Log:
Ensure that correct encoding is used to parse headers and values (problem
revealed by filenames with accented letters)
Revision ChangesPath
1.7 +14 -12
cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart/MultipartParser.java
Index: MultipartParser.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart/MultipartParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MultipartParser.java 5 Mar 2004 13:02:58 - 1.6
+++ MultipartParser.java 11 Mar 2004 15:32:41 - 1.7
@@ -30,6 +30,8 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.avalon.excalibur.io.IOUtil;
+
/**
* This class is used to implement a multipart request wrapper.
* It will parse the http post stream and and fill it's hashtable with
values.
@@ -96,7 +98,6 @@
}
this.parts = new Hashtable();
-
BufferedInputStream bufferedStream = new
BufferedInputStream(requestStream);
PushbackInputStream pushbackStream = new
PushbackInputStream(bufferedStream, MAX_BOUNDARY_SIZE);
TokenStream stream = new TokenStream(pushbackStream);
@@ -255,14 +256,14 @@
private void parseInlinePart(TokenStream in, Hashtable headers)
throws IOException {
-byte[] buf = new byte[INLINE_BUFFER_SIZE];
-StringBuffer value = new StringBuffer();
+ // Buffer incoming bytes for proper string decoding (there can
be multibyte chars)
+ByteArrayOutputStream bos = new ByteArrayOutputStream();
while (in.getState() == TokenStream.STATE_READING) {
-int read = in.read(buf);
-value.append(new String(buf, 0, read, this.characterEncoding));
+ int c = in.read();
+ if (c != -1) bos.write(c);
}
-
+
String field = (String) headers.get(name);
Vector v = (Vector) this.parts.get(field);
@@ -271,7 +272,7 @@
this.parts.put(field, v);
}
-v.add(value.toString());
+v.add(new String(bos.toByteArray(), this.characterEncoding));
}
/**
@@ -335,12 +336,13 @@
* @throws IOException
*/
private String readln(TokenStream in) throws IOException {
-
-StringBuffer out = new StringBuffer();
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
int b = in.read();
while ((b != -1) (b != '\r')) {
-out.append((char) b);
+bos.write(b);
b = in.read();
}
@@ -348,6 +350,6 @@
in.read();// read '\n'
}
-return out.toString();
+return new String(bos.toByteArray(), this.characterEncoding);
}
}
cvs commit: cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/environment/background BackgroundEnvironment.java
sylvain 2004/03/11 07:38:31
Modified:src/blocks/cron/java/org/apache/cocoon/components/cron
QuartzJobScheduler.java TestCronJob.java
QuartzJobExecutor.java
AbstractPipelineCallingCronJob.java
src/blocks/cron/java/org/apache/cocoon/environment/background
BackgroundEnvironment.java
Log:
Refactor job launching to setup an environment that allows normal use of the
sourceresolver, including cocoon: protocol
Revision ChangesPath
1.11 +99 -81
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
Index: QuartzJobScheduler.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- QuartzJobScheduler.java 8 Mar 2004 13:43:42 - 1.10
+++ QuartzJobScheduler.java 11 Mar 2004 15:38:31 - 1.11
@@ -23,6 +23,7 @@
import org.apache.avalon.framework.CascadingException;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
@@ -38,6 +39,7 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.background.BackgroundEnvironment;
import org.quartz.CronTrigger;
import org.quartz.Job;
import org.quartz.JobDataMap;
@@ -46,9 +48,7 @@
import org.quartz.SchedulerException;
import org.quartz.SimpleTrigger;
import org.quartz.Trigger;
-
import org.quartz.impl.DirectSchedulerFactory;
-
import org.quartz.simpl.RAMJobStore;
import EDU.oswego.cs.dl.util.concurrent.BoundedBuffer;
@@ -66,8 +66,11 @@
*/
public class QuartzJobScheduler
extends AbstractLogEnabled
-implements JobScheduler, Component, ThreadSafe, Serviceable, Configurable,
Startable, Disposable, Contextualizable {
-/** ThreadPool policy RUN */
+implements JobScheduler, Component, ThreadSafe, Serviceable, Configurable,
Startable, Disposable,
+Contextualizable, Initializable {
+ private org.apache.cocoon.environment.Context environmentContext;
+
+ /** ThreadPool policy RUN */
private static final String POLICY_RUN = RUN;
/** ThreadPool policy WAIT */
@@ -93,6 +96,9 @@
/** Map key for the service manager */
static final String DATA_MAP_MANAGER =
QuartzJobScheduler.ServiceManager;
+
+/** Map key for the environment context (needed by
BackgroundEnvironment) */
+static final String DATA_MAP_ENV_CONTEXT =
QuartzJobScheduler.EnvironmentContext;
/** Map key for the logger */
static final String DATA_MAP_LOGGER = QuartzJobScheduler.Logger;
@@ -116,23 +122,29 @@
static final String DEFAULT_QUARTZ_SCHEDULER_NAME = Cocoon;
/** The PooledExecutor instance */
-private PooledExecutor m_executor;
+private PooledExecutor executor;
/** The quartz scheduler */
-private Scheduler m_scheduler;
+private Scheduler scheduler;
/** The ServiceManager instance */
-private ServiceManager m_manager;
+private ServiceManager manager;
+
+/** The configuration, parsed in initialize() */
+private Configuration config;
/** Should we wait for running jobs to terminate on shutdown ? */
private boolean m_shutdownGraceful;
+ /** The Cocoon enviroment in which jobs will operate */
+ private BackgroundEnvironment jobEnvironment;
+
/* (non-Javadoc)
* @see org.apache.cocoon.components.cron.JobScheduler#getJobNames()
*/
public String[] getJobNames() {
try {
-final String[] names =
m_scheduler.getJobNames(DEFAULT_QUARTZ_JOB_GROUP);
+final String[] names =
scheduler.getJobNames(DEFAULT_QUARTZ_JOB_GROUP);
Arrays.sort(names);
return names;
@@ -148,7 +160,7 @@
*/
public JobSchedulerEntry getJobSchedulerEntry(String jobname) {
try {
-return new QuartzJobSchedulerEntry(jobname, m_scheduler);
+return new QuartzJobSchedulerEntry(jobname, scheduler);
} catch (final Exception e) {
getLogger().error(cannot create QuartzJobSchedulerEntry, e);
}
@@ -260,25 +272,7 @@
*/
public void configure(final Configuration config)
throws ConfigurationException {
-try {
-// If cocoon reloads (or is it the
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
stephan 2004/03/11 07:41:43
Modified:tools/src blocks-build.xsl
Log:
Apply all xconf file in one shoot.
Revision ChangesPath
1.51 +5 -7 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- blocks-build.xsl 10 Mar 2004 09:44:34 - 1.50
+++ blocks-build.xsl 11 Mar 2004 15:41:43 - 1.51
@@ -241,16 +241,14 @@
xsl:for-each select=$cocoon-blocks
xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
include name={$block-name}/conf/*.xmap
unless=unless.exclude.block.{$block-name}/
- include name={$block-name}/conf/*.xpipe
unless=unless.exclude.block.{$block-name}/
/xsl:for-each
/xpatch
- !-- This is much slower, but preserves the dependencies --
- xsl:for-each select=$cocoon-blocks
-xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
-xpatch file=${{build.webapp}}/WEB-INF/cocoon.xconf
srcdir=${{blocks}} addcomments=true
+ xpatch file=${{build.webapp}}/WEB-INF/cocoon.xconf
srcdir=${{blocks}} addcomments=true
+xsl:for-each select=$cocoon-blocks
+ xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
include name={$block-name}/conf/*.xconf
unless=unless.exclude.block.{$block-name}/
-/xpatch
- /xsl:for-each
+/xsl:for-each
+ /xpatch
xpatch file=${{build.webapp}}/WEB-INF/logkit.xconf
srcdir=${{blocks}}
xsl:for-each select=$cocoon-blocks
xsl:variable name=block-name
select=substring-after(@name,'cocoon-block-')/
cvs commit: cocoon-2.1/src/webapp/samples/slides sitemap.xmap
stephan 2004/03/11 08:25:50 Modified:.gump.xml src/blocks/apples/samples sitemap.xmap src/blocks/axis/samples sitemap.xmap src/blocks/cron/samples sitemap.xmap src/blocks/databases/samples sitemap.xmap src/blocks/databases/samples/mod-db sitemap.xmap src/blocks/databases/samples/org-db sitemap.xmap src/blocks/databases/samples/transform sitemap.xmap src/blocks/databases/samples/tutorial sitemap.xmap src/blocks/databases/samples/xsp sitemap.xmap src/blocks/deli/samples sitemap.xmap src/blocks/eventcache/samples sitemap.xmap src/blocks/forms/samples sitemap.xmap src/blocks/forms/samples/forms sitemap.xmap src/blocks/forms/samples/v2 sitemap.xmap src/blocks/html/conf tidy.xmap src/blocks/jms/samples/database sitemap.xmap src/blocks/jsp/samples sitemap.xmap src/blocks/jxforms/samples sitemap.xmap src/blocks/linkrewriter/samples sitemap.xmap src/blocks/linkrewriter/samples/bookdemo sitemap.xmap src/blocks/linkrewriter/samples/sitedemo sitemap.xmap src/blocks/lucene/samples sitemap.xmap src/blocks/mail/samples/mail sitemap.xmap src/blocks/mail/samples/sendmail sitemap.xmap src/blocks/midi/samples sitemap.xmap src/blocks/petstore/samples sitemap.xmap src/blocks/poi/samples sitemap.xmap src/blocks/portal-fw/samples sitemap.xmap src/blocks/profiler/samples sitemap.xmap src/blocks/scratchpad/samples/betwixt sitemap.xmap src/blocks/scratchpad/samples/castor sitemap.xmap src/blocks/scratchpad/samples/image-auth sitemap.xmap src/blocks/scratchpad/samples/jelly sitemap.xmap src/blocks/scratchpad/samples/othello sitemap.xmap src/blocks/scratchpad/samples/sitemap-viewer sitemap.xmap src/blocks/slide/samples sitemap.xmap src/blocks/swf/samples sitemap.xmap src/blocks/web3/samples sitemap.xmap src/blocks/webdav/samples sitemap.xmap src/blocks/xmlform/samples sitemap.xmap src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java form-validator.xsl src/blocks/xsp/samples sitemap.xmap src/webapp sitemap.xmap src/webapp/samples/filter sitemap.xmap src/webapp/samples/imagereader sitemap.xmap src/webapp/samples/paginator sitemap.xmap src/webapp/samples/protected sitemap.xmap src/webapp/samples/simpleform/four sitemap.xmap src/webapp/samples/simpleform/one sitemap.xmap src/webapp/samples/simpleform/three sitemap.xmap src/webapp/samples/simpleform/two sitemap.xmap src/webapp/samples/slides sitemap.xmap Added: src/blocks/asciiart/conf asciiart-generator.xmap src/blocks/scratchpad/conf regex-matcher.xmap Log: One declaration of a sitemap component should be enough. I try to reduce the maintenance costs. Revision ChangesPath 1.125 +2 -1 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- gump.xml 11 Mar 2004 00:12:11 - 1.124 +++ gump.xml 11 Mar 2004 16:25:46 - 1.125 @@ -695,6 +695,7 @@ depend project=cocoon inherit=all/ depend project=cocoon-block-asciiart/ +depend project=cocoon-block-scratchpad/ depend project=javamail/ depend project=jaf/ 1.7 +1 -7 cocoon-2.1/src/blocks/apples/samples/sitemap.xmap Index: sitemap.xmap === RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/sitemap.xmap,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sitemap.xmap 6 Mar 2004 02:26:12 - 1.6 +++ sitemap.xmap 11 Mar 2004 16:25:46 - 1.7 @@ -26,7 +26,6 @@ map:components map:generators default=file map:generator name=woody src=org.apache.cocoon.woody.generation.WoodyGenerator logger=woody/ - map:generator name=jx src=org.apache.cocoon.generation.JXTemplateGenerator label=content,data logger=sitemap.generator.jx/ /map:generators map:transformers default=xalan map:transformer name=woody src=org.apache.cocoon.woody.transformation.WoodyTemplateTransformer logger=woody/ @@ -38,11 +37,6 @@
cvs commit: cocoon-2.1/src/blocks/ojb/samples/forms - New directory
stephan 2004/03/11 08:57:57 cocoon-2.1/src/blocks/ojb/samples/forms - New directory
cvs commit: cocoon-2.1/src/blocks/ojb/samples/woody employee.js employee.xml employee_bind.xml employee_template.xml success.xsp
stephan 2004/03/11 08:59:51
Modified:src/blocks/ojb/conf ojb.xsamples
src/blocks/ojb/samples sitemap.xmap welcome.xml
Added: src/blocks/ojb/samples/forms employee.js employee.xml
employee_bind.xml employee_template.xml success.xsp
Removed: src/blocks/ojb/samples/woody employee.js employee.xml
employee_bind.xml employee_template.xml success.xsp
Log:
Update ojb block to cforms, but seems not to work:
PersistenceBrokerException: Cannot get Connection from DataSource named null
Revision ChangesPath
1.4 +4 -0 cocoon-2.1/src/blocks/ojb/conf/ojb.xsamples
Index: ojb.xsamples
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/ojb/conf/ojb.xsamples,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ojb.xsamples 6 Mar 2004 02:25:38 - 1.3
+++ ojb.xsamples 11 Mar 2004 16:59:50 - 1.4
@@ -18,6 +18,10 @@
xsamples xpath=/samples unless=[EMAIL PROTECTED]'OJB']
group name=OJB
+note
+ For the examples of this block to work, you need to download
+ the Java Data Objects (JDO) Reference Implementation from java.sun.com
.
+/note
sample name=OJB href=ojb/
Apache Object/Relational Bridge.
/sample
1.7 +24 -28cocoon-2.1/src/blocks/ojb/samples/sitemap.xmap
Index: sitemap.xmap
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/ojb/samples/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 6 Mar 2004 02:26:13 - 1.6
+++ sitemap.xmap 11 Mar 2004 16:59:50 - 1.7
@@ -19,19 +19,15 @@
map:components
- map:transformers default=xalan
-map:transformer name=woody
src=org.apache.cocoon.woody.transformation.WoodyTemplateTransformer
logger=woody/
-map:transformer name=i18n
src=org.apache.cocoon.transformation.I18nTransformer
- catalogues default=other
-catalogue id=other name=OtherMessages
location=context://samples/woody/messages/
-catalogue id=woody name=WoodyMessages
location=context://samples/woody/messages/
- /catalogues
- cache-at-startuptrue/cache-at-startup
-/map:transformer
- /map:transformers
-
- map:pipes default=caching
- /map:pipes
+ map:transformers default=xalan
+ map:transformer name=i18n
src=org.apache.cocoon.transformation.I18nTransformer
+ catalogues default=forms
+ catalogue id=other name=OtherMessages location=messages/
+ catalogue id=forms name=FormMessages location=messages/
+ /catalogues
+ cache-at-startuptrue/cache-at-startup
+ /map:transformer
+ /map:transformers
/map:components
@@ -52,7 +48,7 @@
!-- indicates what flowscript to attach to this sitemap --
map:flow language=javascript
- map:script src=woody/employee.js/
+ map:script src=forms/employee.js/
/map:flow
map:pipelines
@@ -79,48 +75,48 @@
/map:match
!--
-| Form1 example, demonstrates usage of flow and woody
+| Form1 example, demonstrates usage of flow and forms
--
-map:match pattern=jdo/woody/employee
-map:call function=woody
+map:match pattern=jdo/forms/employee
+map:call function=forms
map:parameter name=function value=employeeform_jdo/
-map:parameter name=form-definition
value=woody/employee.xml/
-map:parameter name=bindingURI
value=woody/employee_bind.xml/
+map:parameter name=form-definition
value=forms/employee.xml/
+map:parameter name=bindingURI
value=forms/employee_bind.xml/
/map:call
/map:match
-map:match pattern=jdo/woody/employee-form-display
-map:generate src=woody/employee_template.xml/
-map:transform type=woody/
+map:match pattern=jdo/forms/employee-form-display
+map:generate src=forms/employee_template.xml/
+map:transform type=form/
map:transform type=i18n
map:parameter name=locale value=en-US/
/map:transform
-map:transform
src=context://samples/woody/xsl/html/woody-default.xsl/
+map:transform
src=context://samples/forms/xsl/html/forms-default.xsl/
map:transform
src=context://samples/common/style/xsl/html/simple-page2html.xsl
map:parameter name=contextPath value={request:contextPath}/
map:parameter name=servletPath value={request:servletPath}/
map:parameter name=sitemapURI value={request:sitemapURI}/
-map:parameter name=file
cvs commit: cocoon-2.1/src/blocks/apples/samples sitemap.xmap welcome.xml
stephan 2004/03/11 09:12:15
Modified:
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples
BindingWoodyApple.java
src/blocks/apples/samples sitemap.xmap welcome.xml
Log:
woody - cforms
Revision ChangesPath
1.9 +2 -1
cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java
Index: BindingWoodyApple.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BindingWoodyApple.java9 Mar 2004 10:21:28 - 1.8
+++ BindingWoodyApple.java11 Mar 2004 17:12:13 - 1.9
@@ -41,6 +41,7 @@
import org.apache.cocoon.forms.binding.Binding;
import org.apache.cocoon.forms.binding.BindingManager;
import org.apache.cocoon.forms.formmodel.Form;
+import org.apache.cocoon.forms.transformation.FormPipelineConfig;
import org.apache.cocoon.xml.dom.DOMStreamer;
import org.apache.excalibur.source.ModifiableSource;
import org.apache.excalibur.source.Source;
@@ -194,7 +195,7 @@
if (this.wrapperContextMap == null) {
if (this.form != null) {
this.wrapperContextMap = new HashMap();
-this.wrapperContextMap.put(woody-form, this.form);
+this.wrapperContextMap.put(FormPipelineConfig.COCOONFORM,
this.form);
}
}
return this.wrapperContextMap;
1.8 +10 -14cocoon-2.1/src/blocks/apples/samples/sitemap.xmap
Index: sitemap.xmap
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/sitemap.xmap,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sitemap.xmap 11 Mar 2004 16:25:46 - 1.7
+++ sitemap.xmap 11 Mar 2004 17:12:14 - 1.8
@@ -24,15 +24,11 @@
map:sitemap xmlns:map=http://apache.org/cocoon/sitemap/1.0;
map:components
-map:generators default=file
- map:generator name=woody
src=org.apache.cocoon.woody.generation.WoodyGenerator logger=woody/
-/map:generators
map:transformers default=xalan
- map:transformer name=woody
src=org.apache.cocoon.woody.transformation.WoodyTemplateTransformer
logger=woody/
map:transformer name=i18n
src=org.apache.cocoon.transformation.I18nTransformer
-catalogues default=other
- catalogue id=other name=OtherMessages
location=context://samples/woody/messages/
- catalogue id=woody name=WoodyMessages
location=context://samples/woody/messages/
+catalogues default=forms
+ catalogue id=other name=OtherMessages location=messages/
+ catalogue id=forms name=FormMessages location=messages/
/catalogues
cache-at-startuptrue/cache-at-startup
/map:transformer
@@ -91,16 +87,16 @@
!--+
- | Binding form sample, reuses pipelines stolen from woody
+ | Binding form sample, reuses pipelines stolen from Cocoon Forms
+--
map:match pattern=form2xml.flow
map:call
function=org.apache.cocoon.components.flow.apples.samples.BindingWoodyApple
- map:parameter name=form-src
value=context://samples/woody/forms/form2_model.xml/
- map:parameter name=binding-src
value=context://samples/woody/forms/form2_bind_xml.xml/
- map:parameter name=documentURI
value=context://samples/woody/forms/form2_data.xml/
- map:parameter name=form-pipe
value=/samples/woody/form2-display-pipeline/
- map:parameter name=valid-pipe
value=/samples/woody/form2-success-pipeline/
+ map:parameter name=form-src
value=context://samples/forms/forms/form2_model.xml/
+ map:parameter name=binding-src
value=context://samples/forms/forms/form2_bind_xml.xml/
+ map:parameter name=documentURI
value=context://samples/forms/forms/form2_data.xml/
+ map:parameter name=form-pipe
value=/samples/forms/form2-display-pipeline/
+ map:parameter name=valid-pipe
value=/samples/forms/form2-success-pipeline/
/map:call
/map:match
1.4 +4 -4 cocoon-2.1/src/blocks/apples/samples/welcome.xml
Index: welcome.xml
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/apples/samples/welcome.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- welcome.xml 6 Mar 2004 02:26:12 - 1.3
+++ welcome.xml 11 Mar 2004 17:12:14 - 1.4
@@ -29,10 +29,10 @@
/group
group name=Apples Samples
- sample
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart MultipartParser.java
joerg 2004/03/11 10:21:48
Modified:src/java/org/apache/cocoon/servlet/multipart
MultipartParser.java
Log:
removed unused variable and import
Revision ChangesPath
1.8 +1 -5
cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart/MultipartParser.java
Index: MultipartParser.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart/MultipartParser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MultipartParser.java 11 Mar 2004 15:32:41 - 1.7
+++ MultipartParser.java 11 Mar 2004 18:21:48 - 1.8
@@ -30,8 +30,6 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.avalon.excalibur.io.IOUtil;
-
/**
* This class is used to implement a multipart request wrapper.
* It will parse the http post stream and and fill it's hashtable with
values.
@@ -46,8 +44,6 @@
public class MultipartParser {
private final static int FILE_BUFFER_SIZE = 4096;
-
-private final static int INLINE_BUFFER_SIZE = 256;
private static final int MAX_BOUNDARY_SIZE = 128;
cvs commit: cocoon-2.1/tools/targets upgrade-build.xml
joerg 2004/03/11 11:42:32 Modified:tools/targets upgrade-build.xml Log: a little mistake Revision ChangesPath 1.4 +1 -1 cocoon-2.1/tools/targets/upgrade-build.xml Index: upgrade-build.xml === RCS file: /home/cvs/cocoon-2.1/tools/targets/upgrade-build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- upgrade-build.xml 11 Mar 2004 19:33:04 - 1.3 +++ upgrade-build.xml 11 Mar 2004 19:42:32 - 1.4 @@ -153,7 +153,7 @@ value=resource://org/apache/cocoon/forms/flow/javascript/Form.js/ replacefilter token=org.apache.cocoon.woody.datatype.ValidationError -value=org.apache.forms.validation.ValidationError/ +value=org.apache.cocoon.forms.validation.ValidationError/ replacefilter token=org/apache/cocoon/woody value=org/apache/cocoon/forms/
cvs commit: cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron QuartzJobScheduler.java
sylvain 2004/03/11 14:05:12
Modified:src/blocks/cron/java/org/apache/cocoon/components/cron
QuartzJobScheduler.java
Log:
Some code cleanup, as suggested by Joerg's Eclipse ;-)
Revision ChangesPath
1.12 +2 -8
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
Index: QuartzJobScheduler.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- QuartzJobScheduler.java 11 Mar 2004 15:38:31 - 1.11
+++ QuartzJobScheduler.java 11 Mar 2004 22:05:12 - 1.12
@@ -39,7 +39,6 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.environment.background.BackgroundEnvironment;
import org.quartz.CronTrigger;
import org.quartz.Job;
import org.quartz.JobDataMap;
@@ -136,9 +135,6 @@
/** Should we wait for running jobs to terminate on shutdown ? */
private boolean m_shutdownGraceful;
- /** The Cocoon enviroment in which jobs will operate */
- private BackgroundEnvironment jobEnvironment;
-
/* (non-Javadoc)
* @see org.apache.cocoon.components.cron.JobScheduler#getJobNames()
*/
@@ -315,8 +311,6 @@
} catch (final SchedulerException se) {
throw new ConfigurationException(cannot create a
quartz scheduler, se);
}
-
- this.jobEnvironment = new BackgroundEnvironment(getLogger(),
this.environmentContext, this.manager);
final Configuration[] triggers =
this.config.getChild(triggers).getChildren(trigger);
createTriggers(triggers);
