You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2006/08/23 10:25:26 UTC
svn commit: r433975 [6/7] - in /cocoon/trunk:
blocks/cocoon-ajax/cocoon-ajax-impl/
blocks/cocoon-axis/cocoon-axis-impl/src/main/java/org/apache/cocoon/components/axis/
blocks/cocoon-axis/cocoon-axis-impl/src/main/resources/org/apache/cocoon/components/...
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-store.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-store.xconf?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-store.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-store.xconf Wed Aug 23 01:25:01 2006
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
-<components>
-
- <!--+
- | Store: generic store. The default implementation is an in-memory store
- | backed by a disk store (based on EHCache). This forms a two-stage
- | cache composed of a fast in-memory MRU front-end and a persistent
- | back-end which stores the less-used objects.
- |
- | Common configuration parameters:
- | maxobjects: Indicates how many objects will be held in the cache.
- | When the number of maxobjects has been reached. The last object
- | in the cache will be thrown out.
- +-->
- <store logger="core.store">
- <parameter name="maxobjects" value="1000"/>
- <parameter name="use-cache-directory" value="true"/>
- </store>
-
-</components>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
+<components>
+
+ <!--+
+ | Store: generic store. The default implementation is an in-memory store
+ | backed by a disk store (based on EHCache). This forms a two-stage
+ | cache composed of a fast in-memory MRU front-end and a persistent
+ | back-end which stores the less-used objects.
+ |
+ | Common configuration parameters:
+ | maxobjects: Indicates how many objects will be held in the cache.
+ | When the number of maxobjects has been reached. The last object
+ | in the cache will be thrown out.
+ +-->
+ <store logger="core.store">
+ <parameter name="maxobjects" value="1000"/>
+ <parameter name="use-cache-directory" value="true"/>
+ </store>
+
+</components>
Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-store.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xml-parser.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xml-parser.xconf?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xml-parser.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xml-parser.xconf Wed Aug 23 01:25:01 2006
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 1999-2006 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.
--->
-<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
-<components>
-
- <!--+
- | XML Parser
- |
- | Apache Cocoon requires a JAXP 1.1 parser. The default parser is
- | org.apache.excalibur.xml.impl.JaxpParser.
- | Note: If you have problems because your servlet environment uses its
- | own parser not conforming to JAXP 1.1 try using the alternative
- | XercesParser instead of the JaxpParser. To activate the XercesParser,
- | change the class attribute to
- | class="org.apache.excalibur.xml.impl.XercesParser"
- | You will also need to add a system property to your JVM,
- | probably on the startup of your servlet engine like this:
- | -Dorg.apache.excalibur.xml.sax.SAXParser=org.apache.excalibur.xml.impl.XercesParser
- |
- | Configuration parameters for the JaxpParser (not the XercesParser!):
- | - validate (boolean, default = false): should the parser validate
- | parsed documents?
- | Note: XML validation is only being used for the documentation build.
- | (If you are going to use it elsewhere, then do so with caution.)
- | You really should have validated all of your XML documents already,
- | according to their proper DTD or schema. Do not expect Cocoon
- | to do it.
- | - namespace-prefixes (boolean, default = false) : do we want
- | namespaces declarations also as 'xmlns:' attributes?
- | Note : setting this to true confuses some XSL processors
- | (e.g. Saxon).
- | - stop-on-warning (boolean, default = true) : should the parser
- | stop parsing if a warning occurs ?
- | - stop-on-recoverable-error (boolean, default = true) : should the
- | parser stop parsing if a recoverable error occurs ?
- | - reuse-parsers (boolean, default = true) : do we want to reuse
- | parsers or create a new parser for each parse ?
- | Note : even if this parameter is true, parsers are not recycled
- | in case of parsing errors : some parsers (e.g. Xerces) do not like
- | to be reused after failure.
- | - sax-parser-factory (string, optional) : the name of the
- | SAXParserFactory implementation class to be used instead of using
- | the standard JAXP mechanism (SAXParserFactory.newInstance()). This
- | allows to choose unambiguously the JAXP implementation to be used
- | when several of them are available in the classpath.
- | - document-builder-factory (string, optional) : the name of the
- | DocumentBuilderFactory implementation to be used (similar to
- | sax-parser-factory for DOM).
- | - drop-dtd-comments : should comment() events from DTD's be dropped?
- | Note: Since this implementation does not support the DeclHandler
- | interface anyway, it is quite useless to only have the comments
- | from DTD. And the comment events from the internal DTD subset
- | would appear in the serialized output again.
- +-->
- <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser"
- logger="core.xml-parser" pool-max="32">
- <parameter name="validate" value="false"/>
- <parameter name="namespace-prefixes" value="false"/>
- <parameter name="stop-on-warning" value="true"/>
- <parameter name="stop-on-recoverable-error" value="true"/>
- <parameter name="reuse-parsers" value="false"/>
- <parameter name="drop-dtd-comments" value="true"/>
- </xml-parser>
-
-</components>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2006 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.
+-->
+<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
+<components>
+
+ <!--+
+ | XML Parser
+ |
+ | Apache Cocoon requires a JAXP 1.1 parser. The default parser is
+ | org.apache.excalibur.xml.impl.JaxpParser.
+ | Note: If you have problems because your servlet environment uses its
+ | own parser not conforming to JAXP 1.1 try using the alternative
+ | XercesParser instead of the JaxpParser. To activate the XercesParser,
+ | change the class attribute to
+ | class="org.apache.excalibur.xml.impl.XercesParser"
+ | You will also need to add a system property to your JVM,
+ | probably on the startup of your servlet engine like this:
+ | -Dorg.apache.excalibur.xml.sax.SAXParser=org.apache.excalibur.xml.impl.XercesParser
+ |
+ | Configuration parameters for the JaxpParser (not the XercesParser!):
+ | - validate (boolean, default = false): should the parser validate
+ | parsed documents?
+ | Note: XML validation is only being used for the documentation build.
+ | (If you are going to use it elsewhere, then do so with caution.)
+ | You really should have validated all of your XML documents already,
+ | according to their proper DTD or schema. Do not expect Cocoon
+ | to do it.
+ | - namespace-prefixes (boolean, default = false) : do we want
+ | namespaces declarations also as 'xmlns:' attributes?
+ | Note : setting this to true confuses some XSL processors
+ | (e.g. Saxon).
+ | - stop-on-warning (boolean, default = true) : should the parser
+ | stop parsing if a warning occurs ?
+ | - stop-on-recoverable-error (boolean, default = true) : should the
+ | parser stop parsing if a recoverable error occurs ?
+ | - reuse-parsers (boolean, default = true) : do we want to reuse
+ | parsers or create a new parser for each parse ?
+ | Note : even if this parameter is true, parsers are not recycled
+ | in case of parsing errors : some parsers (e.g. Xerces) do not like
+ | to be reused after failure.
+ | - sax-parser-factory (string, optional) : the name of the
+ | SAXParserFactory implementation class to be used instead of using
+ | the standard JAXP mechanism (SAXParserFactory.newInstance()). This
+ | allows to choose unambiguously the JAXP implementation to be used
+ | when several of them are available in the classpath.
+ | - document-builder-factory (string, optional) : the name of the
+ | DocumentBuilderFactory implementation to be used (similar to
+ | sax-parser-factory for DOM).
+ | - drop-dtd-comments : should comment() events from DTD's be dropped?
+ | Note: Since this implementation does not support the DeclHandler
+ | interface anyway, it is quite useless to only have the comments
+ | from DTD. And the comment events from the internal DTD subset
+ | would appear in the serialized output again.
+ +-->
+ <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser"
+ logger="core.xml-parser" pool-max="32">
+ <parameter name="validate" value="false"/>
+ <parameter name="namespace-prefixes" value="false"/>
+ <parameter name="stop-on-warning" value="true"/>
+ <parameter name="stop-on-recoverable-error" value="true"/>
+ <parameter name="reuse-parsers" value="false"/>
+ <parameter name="drop-dtd-comments" value="true"/>
+ </xml-parser>
+
+</components>
Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xml-parser.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xpath-processor.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xpath-processor.xconf?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xpath-processor.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xpath-processor.xconf Wed Aug 23 01:25:01 2006
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 1999-2006 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.
--->
-<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
-<components>
-
- <!--+
- | Xpath Processor (Based on Xalan)
- +-->
- <xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl" logger="core.xpath"/>
-
-</components>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2006 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.
+-->
+<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
+<components>
+
+ <!--+
+ | Xpath Processor (Based on Xalan)
+ +-->
+ <xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl" logger="core.xpath"/>
+
+</components>
Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xpath-processor.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-processor.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-processor.xconf?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-processor.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-processor.xconf Wed Aug 23 01:25:01 2006
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
-<components>
-
- <!--+
- | XSLT Processor
- |
- | 'incremental-processing' (only works with Xalan) allows the XSLT
- | processor to start the output of the transformation as soon as possible.
- | if set to false, the transforer waits until the end of the
- | transformation to deliver the output.
- | WARNING: * if you enable incremental-processing, you should be aware of
- | the following bug:
- | http://issues.apache.org/bugzilla/show_bug.cgi?id=13186
- | * incremental-processing creates an additional, non-pooled thread.
- | * using incremental-processing does not save memory, the input
- | tree will still be build completely.
- | * incremental processing is a 'static' thing in Xalan: if you
- | enable it on one xslt-processor, enable it on all.
- +-->
- <xslt-processor logger="core.xslt">
- <parameter name="use-store" value="true"/>
- <parameter name="incremental-processing" value="false"/>
- </xslt-processor>
-
-</components>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
+<components>
+
+ <!--+
+ | XSLT Processor
+ |
+ | 'incremental-processing' (only works with Xalan) allows the XSLT
+ | processor to start the output of the transformation as soon as possible.
+ | if set to false, the transforer waits until the end of the
+ | transformation to deliver the output.
+ | WARNING: * if you enable incremental-processing, you should be aware of
+ | the following bug:
+ | http://issues.apache.org/bugzilla/show_bug.cgi?id=13186
+ | * incremental-processing creates an additional, non-pooled thread.
+ | * using incremental-processing does not save memory, the input
+ | tree will still be build completely.
+ | * incremental processing is a 'static' thing in Xalan: if you
+ | enable it on one xslt-processor, enable it on all.
+ +-->
+ <xslt-processor logger="core.xslt">
+ <parameter name="use-store" value="true"/>
+ <parameter name="incremental-processing" value="false"/>
+ </xslt-processor>
+
+</components>
Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-processor.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-saxon.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-saxon.xconf?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-saxon.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-saxon.xconf Wed Aug 23 01:25:01 2006
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 1999-2006 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.
--->
-<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
-<components>
-
- <!--+
- | Saxon XSLT Processor
- | For old (6.5.2) Saxon use:
- | <parameter name="transformer-factory" value="com.icl.saxon.TransformerFactoryImpl"/>
- | For new (7+) Saxon use:
- | <parameter name="transformer-factory" value="net.sf.saxon.TransformerFactoryImpl"/>
- <component logger="core.xslt"
- role="org.apache.excalibur.xml.xslt.XSLTProcessor/saxon"
- class="org.apache.cocoon.components.xslt.TraxProcessor">
- <parameter name="use-store" value="true"/>
- <parameter name="transformer-factory" value="com.icl.saxon.TransformerFactoryImpl"/>
- </component>
- +-->
-
-</components>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2006 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.
+-->
+<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
+<components>
+
+ <!--+
+ | Saxon XSLT Processor
+ | For old (6.5.2) Saxon use:
+ | <parameter name="transformer-factory" value="com.icl.saxon.TransformerFactoryImpl"/>
+ | For new (7+) Saxon use:
+ | <parameter name="transformer-factory" value="net.sf.saxon.TransformerFactoryImpl"/>
+ <component logger="core.xslt"
+ role="org.apache.excalibur.xml.xslt.XSLTProcessor/saxon"
+ class="org.apache.cocoon.components.xslt.TraxProcessor">
+ <parameter name="use-store" value="true"/>
+ <parameter name="transformer-factory" value="com.icl.saxon.TransformerFactoryImpl"/>
+ </component>
+ +-->
+
+</components>
Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-saxon.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-xalan.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-xalan.xconf?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-xalan.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-xalan.xconf Wed Aug 23 01:25:01 2006
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
-<components>
-
- <!--+
- | Xalan XSLT Processor
- +-->
- <component logger="core.xslt"
- role="org.apache.excalibur.xml.xslt.XSLTProcessor/xalan"
- class="org.apache.cocoon.components.xslt.TraxProcessor">
- <parameter name="use-store" value="true"/>
- <parameter name="incremental-processing" value="false"/>
- <parameter name="transformer-factory" value="org.apache.xalan.processor.TransformerFactoryImpl"/>
- </component>
-
-</components>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
+<components>
+
+ <!--+
+ | Xalan XSLT Processor
+ +-->
+ <component logger="core.xslt"
+ role="org.apache.excalibur.xml.xslt.XSLTProcessor/xalan"
+ class="org.apache.cocoon.components.xslt.TraxProcessor">
+ <parameter name="use-store" value="true"/>
+ <parameter name="incremental-processing" value="false"/>
+ <parameter name="transformer-factory" value="org.apache.xalan.processor.TransformerFactoryImpl"/>
+ </component>
+
+</components>
Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-xalan.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-xsltc.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-xsltc.xconf?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-xsltc.xconf (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-xsltc.xconf Wed Aug 23 01:25:01 2006
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
-<components>
-
- <!--+
- | XSLT Processor using xsltc from Xalan
- | For Interpreted Xalan use:
- | <transformer-factory>org.apache.xalan.processor.TransformerFactoryImpl</transformer-factory>
- +-->
- <component logger="core.xslt"
- role="org.apache.excalibur.xml.xslt.XSLTProcessor/xsltc"
- class="org.apache.cocoon.components.xslt.TraxProcessor">
- <parameter name="use-store" value="true"/>
- <parameter name="transformer-factory" value="org.apache.xalan.xsltc.trax.TransformerFactoryImpl"/>
- </component>
-
-</components>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
+<components>
+
+ <!--+
+ | XSLT Processor using xsltc from Xalan
+ | For Interpreted Xalan use:
+ | <transformer-factory>org.apache.xalan.processor.TransformerFactoryImpl</transformer-factory>
+ +-->
+ <component logger="core.xslt"
+ role="org.apache.excalibur.xml.xslt.XSLTProcessor/xsltc"
+ class="org.apache.cocoon.components.xslt.TraxProcessor">
+ <parameter name="use-store" value="true"/>
+ <parameter name="transformer-factory" value="org.apache.xalan.xsltc.trax.TransformerFactoryImpl"/>
+ </component>
+
+</components>
Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/legacy/xconf/cocoon-core-xslt-xsltc.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml Wed Aug 23 01:25:01 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Copyright 2006 The Apache Software Foundation
Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring/cocoon-core-applicationContext.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest (original)
+++ cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest Wed Aug 23 01:25:01 2006
@@ -1,27 +1,27 @@
-<?xml version="1.0" ?>
-<!--
- Copyright 1999-2006 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.
--->
-<testcase>
- <roles>
- <role name="org.apache.excalibur.xml.xpath.XPathProcessor"
- default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
-
- </roles>
-
- <components>
- </components>
-
-</testcase>
+<?xml version="1.0" ?>
+<!--
+ Copyright 1999-2006 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.
+-->
+<testcase>
+ <roles>
+ <role name="org.apache.excalibur.xml.xpath.XPathProcessor"
+ default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
+
+ </roles>
+
+ <components>
+ </components>
+
+</testcase>
Propchange: cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/xconf/cocoon-webapp-modules-input.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/xconf/cocoon-webapp-modules-input.xconf?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/xconf/cocoon-webapp-modules-input.xconf (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/xconf/cocoon-webapp-modules-input.xconf Wed Aug 23 01:25:01 2006
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 1999-2006 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.
--->
-<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
-<components>
-
- <!--+
- | Following five modules definitions, 'defaults', 'myxml',
- | 'slashdot' 'random-100-to-500' and 'random-5000-to-10000',
- | are used only in the samples.
- +-->
- <input-modules>
- <component-instance logger="core.modules.input" name="defaults"
- class="org.apache.cocoon.components.modules.input.DefaultsModule">
- <values>
- <skin>defaultSkin</skin>
- <base-url>http://localhost:8080/cocoon</base-url>
- </values>
- </component-instance>
- <component-instance logger="core.modules.input" name="myxml"
- class="org.apache.cocoon.components.modules.input.XMLFileModule">
- <file src="context://samples/modules/forrestconf.xml"/>
- </component-instance>
- <component-instance logger="core.modules.input" name="slashdot"
- class="org.apache.cocoon.components.modules.input.XMLFileModule">
- <file src="http://slashdot.org/slashdot.rss"/>
- </component-instance>
- <component-instance logger="core.modules.input" name="random-100-to-500"
- class="org.apache.cocoon.components.modules.input.RandomNumberModule">
- <min>100</min>
- <max>500</max>
- </component-instance>
- <component-instance logger="core.modules.input" name="random-5000-to-10000"
- class="org.apache.cocoon.components.modules.input.RandomNumberModule">
- <min>5000</min>
- <max>10000</max>
- </component-instance>
- </input-modules>
-
-</components>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2006 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.
+-->
+<!-- SVN $Id: cocoon-core.xconf 396505 2006-04-24 10:33:03Z antonio $ -->
+<components>
+
+ <!--+
+ | Following five modules definitions, 'defaults', 'myxml',
+ | 'slashdot' 'random-100-to-500' and 'random-5000-to-10000',
+ | are used only in the samples.
+ +-->
+ <input-modules>
+ <component-instance logger="core.modules.input" name="defaults"
+ class="org.apache.cocoon.components.modules.input.DefaultsModule">
+ <values>
+ <skin>defaultSkin</skin>
+ <base-url>http://localhost:8080/cocoon</base-url>
+ </values>
+ </component-instance>
+ <component-instance logger="core.modules.input" name="myxml"
+ class="org.apache.cocoon.components.modules.input.XMLFileModule">
+ <file src="context://samples/modules/forrestconf.xml"/>
+ </component-instance>
+ <component-instance logger="core.modules.input" name="slashdot"
+ class="org.apache.cocoon.components.modules.input.XMLFileModule">
+ <file src="http://slashdot.org/slashdot.rss"/>
+ </component-instance>
+ <component-instance logger="core.modules.input" name="random-100-to-500"
+ class="org.apache.cocoon.components.modules.input.RandomNumberModule">
+ <min>100</min>
+ <max>500</max>
+ </component-instance>
+ <component-instance logger="core.modules.input" name="random-5000-to-10000"
+ class="org.apache.cocoon.components.modules.input.RandomNumberModule">
+ <min>5000</min>
+ <max>10000</max>
+ </component-instance>
+ </input-modules>
+
+</components>
Propchange: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/xconf/cocoon-webapp-modules-input.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/group2samples.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/sitemap.xmap?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/sitemap.xmap (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/sitemap.xmap Wed Aug 23 01:25:01 2006
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 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.
--->
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:pipelines>
- <map:pipeline>
- <map:match pattern="*/**">
- <map:mount uri-prefix="{1}" src="{1}/"/>
- </map:match>
- </map:pipeline>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 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.
+-->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:pipelines>
<map:pipeline>
- <map:match pattern="">
- <map:generate type="xpathdirectory" src="./">
- <map:parameter name="xpath" value="/xsamples/group"/>
- <map:parameter name="depth" value="2"/>
- <map:parameter name="xmlFiles" value="\.xsamples$"/>
- </map:generate>
- <map:transform src="group2samples.xsl"/>
- <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
+ <map:match pattern="*/**">
+ <map:mount uri-prefix="{1}" src="{1}/"/>
+ </map:match>
+ </map:pipeline>
+ <map:pipeline>
+ <map:match pattern="">
+ <map:generate type="xpathdirectory" src="./">
+ <map:parameter name="xpath" value="/xsamples/group"/>
+ <map:parameter name="depth" value="2"/>
+ <map:parameter name="xmlFiles" value="\.xsamples$"/>
+ </map:generate>
+ <map:transform src="group2samples.xsl"/>
+ <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
<map:serialize type="html"/>
</map:match>
- </map:pipeline>
- </map:pipelines>
-</map:sitemap>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
Propchange: cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/sitemap.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/flow.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/redirect/flow.js
('svn:mime-type' removed)
Propchange: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage/flow.js
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/test/sendpage/flow.js
('svn:mime-type' removed)
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/META-INF/archetype.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/cocoon/log4j.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/cocoon/log4j.xconf?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/cocoon/log4j.xconf (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/cocoon/log4j.xconf Wed Aug 23 01:25:01 2006
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
- <!-- This is a sample configuration for log4j.
- It simply just logs everything into a single
- log file.
- Note, that you can use properties for value substitution.
- -->
- <appender name="COCOON_DEFAULT" class="org.apache.log4j.FileAppender">
- <param name="File" value="${log-dir}/log4j.log" />
- <param name="Append" value="false" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>
- </layout>
- </appender>
-
- <root>
- <priority value="error"/>
- <appender-ref ref="COCOON_DEFAULT" />
- </root>
-</log4j:configuration>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <!-- This is a sample configuration for log4j.
+ It simply just logs everything into a single
+ log file.
+ Note, that you can use properties for value substitution.
+ -->
+ <appender name="COCOON_DEFAULT" class="org.apache.log4j.FileAppender">
+ <param name="File" value="${log-dir}/log4j.log" />
+ <param name="Append" value="false" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>
+ </layout>
+ </appender>
+
+ <root>
+ <priority value="error"/>
+ <appender-ref ref="COCOON_DEFAULT" />
+ </root>
+</log4j:configuration>
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/cocoon/log4j.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/cocoon/properties/core.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/cocoon/properties/dev/core.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/sitemap-additions/cocoon-core-sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/sitemap-additions/cocoon-core-sitemap.xmap?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/sitemap-additions/cocoon-core-sitemap.xmap (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/sitemap-additions/cocoon-core-sitemap.xmap Wed Aug 23 01:25:01 2006
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 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.
--->
-<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
- <map:generators default="file">
- <map:generator label="content" logger="sitemap.generator.file" name="file" pool-max="32" src="org.apache.cocoon.generation.FileGenerator"/>
- </map:generators>
-
- <map:transformers default="xslt">
- <map:transformer logger="sitemap.transformer.xslt" name="xslt" pool-max="32" src="org.apache.cocoon.transformation.TraxTransformer">
- <use-request-parameters>false</use-request-parameters>
- <use-session-parameters>false</use-session-parameters>
- <use-cookie-parameters>false</use-cookie-parameters>
- <xslt-processor-role>xalan</xslt-processor-role>
- <check-includes>true</check-includes>
- </map:transformer>
- </map:transformers>
-
- <map:serializers default="xhtml">
- <map:serializer logger="sitemap.serializer.xml" mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
- <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" name="xhtml" pool-max="64" src="org.apache.cocoon.serialization.XMLSerializer">
- <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
- <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
- <encoding>UTF-8</encoding>
- </map:serializer>
- </map:serializers>
-
- <map:readers default="resource">
- <map:reader logger="sitemap.reader.resource" name="resource" pool-max="32" src="org.apache.cocoon.reading.ResourceReader"/>
- </map:readers>
-
- <map:matchers default="wildcard">
- <map:matcher logger="sitemap.matcher.wildcard" name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
- </map:matchers>
-
- <map:pipes default="caching">
- <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
- <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
- </map:pipes>
-
-</map:components>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 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.
+-->
+<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <map:generators default="file">
+ <map:generator label="content" logger="sitemap.generator.file" name="file" pool-max="32" src="org.apache.cocoon.generation.FileGenerator"/>
+ </map:generators>
+
+ <map:transformers default="xslt">
+ <map:transformer logger="sitemap.transformer.xslt" name="xslt" pool-max="32" src="org.apache.cocoon.transformation.TraxTransformer">
+ <use-request-parameters>false</use-request-parameters>
+ <use-session-parameters>false</use-session-parameters>
+ <use-cookie-parameters>false</use-cookie-parameters>
+ <xslt-processor-role>xalan</xslt-processor-role>
+ <check-includes>true</check-includes>
+ </map:transformer>
+ </map:transformers>
+
+ <map:serializers default="xhtml">
+ <map:serializer logger="sitemap.serializer.xml" mime-type="text/xml" name="xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
+ <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" name="xhtml" pool-max="64" src="org.apache.cocoon.serialization.XMLSerializer">
+ <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
+ <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
+ <encoding>UTF-8</encoding>
+ </map:serializer>
+ </map:serializers>
+
+ <map:readers default="resource">
+ <map:reader logger="sitemap.reader.resource" name="resource" pool-max="32" src="org.apache.cocoon.reading.ResourceReader"/>
+ </map:readers>
+
+ <map:matchers default="wildcard">
+ <map:matcher logger="sitemap.matcher.wildcard" name="wildcard" src="org.apache.cocoon.matching.WildcardURIMatcher"/>
+ </map:matchers>
+
+ <map:pipes default="caching">
+ <map:pipe name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
+ <map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
+ </map:pipes>
+
+</map:components>
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/sitemap-additions/cocoon-core-sitemap.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Wed Aug 23 01:25:01 2006
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 1999-2006 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.
--->
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
- <listener>
- <listener-class>org.apache.cocoon.servlet.CocoonServletListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>Cocoon</servlet-name>
- <display-name>Cocoon</display-name>
- <description>Cocoon servlet - ${artifactId}</description>
-
- <servlet-class>org.apache.cocoon.servlet.SitemapServlet</servlet-class>
- <!-- If you don't want to use the ParanoidClassLoader, that reverses
- the classloading hierarchy and loads the jars and classes of the
- web application _first_, and want to rely on the normal web application
- classloading, remove the "classloader-class" parameter. -->
- <init-param>
- <param-name>classloader-class</param-name>
- <param-value>org.apache.cocoon.servlet.ParanoidClassLoader</param-value>
- </init-param>
-
- <init-param>
- <param-name>container-encoding</param-name>
- <param-value>ISO-8859-1</param-value>
- </init-param>
-
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Cocoon</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2006 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.
+-->
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <listener>
+ <listener-class>org.apache.cocoon.servlet.CocoonServletListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>Cocoon</servlet-name>
+ <display-name>Cocoon</display-name>
+ <description>Cocoon servlet - ${artifactId}</description>
+
+ <servlet-class>org.apache.cocoon.servlet.SitemapServlet</servlet-class>
+ <!-- If you don't want to use the ParanoidClassLoader, that reverses
+ the classloading hierarchy and loads the jars and classes of the
+ web application _first_, and want to rely on the normal web application
+ classloading, remove the "classloader-class" parameter. -->
+ <init-param>
+ <param-name>classloader-class</param-name>
+ <param-value>org.apache.cocoon.servlet.ParanoidClassLoader</param-value>
+ </init-param>
+
+ <init-param>
+ <param-name>container-encoding</param-name>
+ <param-value>ISO-8859-1</param-value>
+ </init-param>
+
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Cocoon</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/sitemap.xmap?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/sitemap.xmap (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/sitemap.xmap Wed Aug 23 01:25:01 2006
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2006 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.
--->
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:pipelines>
- <map:pipeline>
- <map:match pattern="">
- <map:generate src="welcome.xml"/>
- <map:serialize type="xhtml"/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
-</map:sitemap>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 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.
+-->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="">
+ <map:generate src="welcome.xml"/>
+ <map:serialize type="xhtml"/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/sitemap.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/welcome.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/welcome.xml?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/welcome.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/welcome.xml Wed Aug 23 01:25:01 2006
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2006 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.
--->
-<html>
- <head>
- <title>Cocoon 2.2 webapp project artifact sucessfully started!</title>
- </head>
- <body>
- <h2>Congratulations,</h2>
- <p>
- you have successfully started your own Cocoon 2.2 project based on the 'cocoon-22-archetype-webapp' Maven 2 archetype.
- </p>
- <p>
- The archetype that you used only loads a reduced set of components. It only includes the most important sitemap components
- (e.g. the file generator, the XSLT transformer, the XHTML serializer) and Cocoon Forms and Cocoon Template.
- </p>
- </body>
+<?xml version="1.0"?>
+<!--
+ Copyright 2006 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.
+-->
+<html>
+ <head>
+ <title>Cocoon 2.2 webapp project artifact sucessfully started!</title>
+ </head>
+ <body>
+ <h2>Congratulations,</h2>
+ <p>
+ you have successfully started your own Cocoon 2.2 project based on the 'cocoon-22-archetype-webapp' Maven 2 archetype.
+ </p>
+ <p>
+ The archetype that you used only loads a reduced set of components. It only includes the most important sitemap components
+ (e.g. the file generator, the XSLT transformer, the XHTML serializer) and Cocoon Forms and Cocoon Template.
+ </p>
+ </body>
</html>
Propchange: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/welcome.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/subDir/test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/subDir/test.xml?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/subDir/test.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/subDir/test.xml Wed Aug 23 01:25:01 2006
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2005 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.
--->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 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.
+-->
<test/>
Propchange: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/src/test/mocks/validMonolithicBlock-02/blockRoot/COB-INF/subDir/test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/cocoon/cocoon.xconf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/revision.txt
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-eclipse-plugin/revision.txt?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-eclipse-plugin/revision.txt (original)
+++ cocoon/trunk/tools/cocoon-maven-eclipse-plugin/revision.txt Wed Aug 23 01:25:01 2006
@@ -1,24 +1,24 @@
-2006-06-27: merge with Revision 417477 (Reinhard)
---------------------------------------------------------------------------
-2006-06-21: merge with Revision 415916 (Reinhard)
---------------------------------------------------------------------------
-Author: reinhard
-Date: Mon Apr 24 04:07:51 2006
-New Revision: 396513
-
-URL: http://svn.apache.org/viewcvs?rev=396513&view=rev
-Log:
-branch maven-eclipse-plugin to add PDE functionality
-
-Added:
- cocoon/trunk/tools/cocoon-maven-eclipse-plugin/
- - copied from r396512, maven/plugins/trunk/maven-eclipse-plugin/
---------------------------------------------------------------------------
-
-merge command for cocoon-maven-eclipse-plugin:
-svn merge -r [last-revision]:HEAD https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/
-(last revision currently is 417477)
-
-merge command for maven-eclipse-plugin:
-svn merge -r [last-revision]:HEAD http://svn.apache.org/repos/asf/cocoon/trunk/tools/cocoon-maven-eclipse-plugin
+2006-06-27: merge with Revision 417477 (Reinhard)
+--------------------------------------------------------------------------
+2006-06-21: merge with Revision 415916 (Reinhard)
+--------------------------------------------------------------------------
+Author: reinhard
+Date: Mon Apr 24 04:07:51 2006
+New Revision: 396513
+
+URL: http://svn.apache.org/viewcvs?rev=396513&view=rev
+Log:
+branch maven-eclipse-plugin to add PDE functionality
+
+Added:
+ cocoon/trunk/tools/cocoon-maven-eclipse-plugin/
+ - copied from r396512, maven/plugins/trunk/maven-eclipse-plugin/
+--------------------------------------------------------------------------
+
+merge command for cocoon-maven-eclipse-plugin:
+svn merge -r [last-revision]:HEAD https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/
+(last revision currently is 417477)
+
+merge command for maven-eclipse-plugin:
+svn merge -r [last-revision]:HEAD http://svn.apache.org/repos/asf/cocoon/trunk/tools/cocoon-maven-eclipse-plugin
(last-revision currently is 396513)
Propchange: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/revision.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java (original)
+++ cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java Wed Aug 23 01:25:01 2006
@@ -1,138 +1,138 @@
-/*
- * Copyright 2006 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.maven.plugin.eclipse.writers;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.eclipse.Messages;
-import org.apache.maven.plugin.ide.IdeDependency;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.MavenProject;
-
-/**
- * The <code>EclipseOSGiManifestWriter</code> ensures that value of the "Bundle-Classpath" property
- * in META-INF/MANIFEST.MF is synchronized with the POM by adding all dependencies that don't have the
- * scope provided.
- */
-public class EclipseOSGiManifestWriter extends AbstractEclipseResourceWriter
-{
-
- public final static String ENTRY_BUNDLE_CLASSPATH = "Bundle-ClassPath:";
-
- public EclipseOSGiManifestWriter(Log log, File eclipseProjectDir, MavenProject project, IdeDependency[] deps)
- {
- super( log, eclipseProjectDir, project, deps );
- }
-
- public void write(File manifestFile, String libdir) throws MojoExecutionException
- {
- // check for existence
- if( !manifestFile.exists() )
- {
- throw new MojoExecutionException( Messages.getString( "nomanifestfile",
- manifestFile.getAbsolutePath() ) );
- }
-
- StringBuffer manifestSb = rewriteManifest(manifestFile, libdir);
- try
- {
- IOUtils.write( manifestSb.toString(), new FileOutputStream( manifestFile ) );
- }
- catch (FileNotFoundException e)
- {
- throw new MojoExecutionException( Messages.getString( "cantwritetofile",
- manifestFile.getAbsolutePath()));
- } catch (IOException e)
- {
- throw new MojoExecutionException( Messages.getString( "cantwritetofile",
- manifestFile.getAbsolutePath()), e);
- }
- }
-
- protected StringBuffer rewriteManifest(File manifestFile, String libdir) throws MojoExecutionException
- {
- boolean inBundleClasspathEntry = false;
- StringBuffer manifestSb = new StringBuffer();
- try {
- BufferedReader in = new BufferedReader(new FileReader(manifestFile));
- String str;
- while ((str = in.readLine()) != null) {
- if(inBundleClasspathEntry && str.indexOf(":") > -1) {
- inBundleClasspathEntry = false;
- if(str.length() > 0) {
- manifestSb.append(str + "\n");
- }
- }
- else if(str.indexOf(ENTRY_BUNDLE_CLASSPATH) > -1)
- {
- inBundleClasspathEntry = true;
- }
- else if(inBundleClasspathEntry)
- {
- // skip it
- }
- else
- {
- manifestSb.append(str + "\n");
- }
- }
- in.close();
- } catch (IOException e)
- {
- throw new MojoExecutionException(Messages.getString("cantreadfile", manifestFile.getAbsolutePath()));
- }
- manifestSb.append(addBundleClasspathEntries(libdir));
- // OSGi manifest headers need to end with a line break
- manifestSb.append("\n");
- return manifestSb;
- }
-
- /**
- * Add all libraries that don't have the scope "provided" to the "Bundle-Classpath".
- */
- protected String addBundleClasspathEntries(String libdir)
- {
- StringBuffer bundleClasspathSb = new StringBuffer(ENTRY_BUNDLE_CLASSPATH);
- int countAddedLibs = 0;
- for( int i = 0; i < this.deps.length; i++ )
- {
- if( !this.deps[i].isProvided() && !this.deps[i].isReferencedProject() )
- {
- if( countAddedLibs != 0 )
- {
- // TODO problems with line endings might appear
- bundleClasspathSb.append(",\n");
- }
- System.out.println("artifact: " + this.deps[i].getArtifactId());
- bundleClasspathSb.append(" " + libdir + "/" + this.deps[i].getFile().getName() + "");
- countAddedLibs++;
- }
- }
- // only insert the name of the property if there are local libraries
- if( countAddedLibs > 0 ) {
- return bundleClasspathSb.toString();
- }
- return "";
- }
-
+/*
+ * Copyright 2006 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.maven.plugin.eclipse.writers;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.eclipse.Messages;
+import org.apache.maven.plugin.ide.IdeDependency;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * The <code>EclipseOSGiManifestWriter</code> ensures that value of the "Bundle-Classpath" property
+ * in META-INF/MANIFEST.MF is synchronized with the POM by adding all dependencies that don't have the
+ * scope provided.
+ */
+public class EclipseOSGiManifestWriter extends AbstractEclipseResourceWriter
+{
+
+ public final static String ENTRY_BUNDLE_CLASSPATH = "Bundle-ClassPath:";
+
+ public EclipseOSGiManifestWriter(Log log, File eclipseProjectDir, MavenProject project, IdeDependency[] deps)
+ {
+ super( log, eclipseProjectDir, project, deps );
+ }
+
+ public void write(File manifestFile, String libdir) throws MojoExecutionException
+ {
+ // check for existence
+ if( !manifestFile.exists() )
+ {
+ throw new MojoExecutionException( Messages.getString( "nomanifestfile",
+ manifestFile.getAbsolutePath() ) );
+ }
+
+ StringBuffer manifestSb = rewriteManifest(manifestFile, libdir);
+ try
+ {
+ IOUtils.write( manifestSb.toString(), new FileOutputStream( manifestFile ) );
+ }
+ catch (FileNotFoundException e)
+ {
+ throw new MojoExecutionException( Messages.getString( "cantwritetofile",
+ manifestFile.getAbsolutePath()));
+ } catch (IOException e)
+ {
+ throw new MojoExecutionException( Messages.getString( "cantwritetofile",
+ manifestFile.getAbsolutePath()), e);
+ }
+ }
+
+ protected StringBuffer rewriteManifest(File manifestFile, String libdir) throws MojoExecutionException
+ {
+ boolean inBundleClasspathEntry = false;
+ StringBuffer manifestSb = new StringBuffer();
+ try {
+ BufferedReader in = new BufferedReader(new FileReader(manifestFile));
+ String str;
+ while ((str = in.readLine()) != null) {
+ if(inBundleClasspathEntry && str.indexOf(":") > -1) {
+ inBundleClasspathEntry = false;
+ if(str.length() > 0) {
+ manifestSb.append(str + "\n");
+ }
+ }
+ else if(str.indexOf(ENTRY_BUNDLE_CLASSPATH) > -1)
+ {
+ inBundleClasspathEntry = true;
+ }
+ else if(inBundleClasspathEntry)
+ {
+ // skip it
+ }
+ else
+ {
+ manifestSb.append(str + "\n");
+ }
+ }
+ in.close();
+ } catch (IOException e)
+ {
+ throw new MojoExecutionException(Messages.getString("cantreadfile", manifestFile.getAbsolutePath()));
+ }
+ manifestSb.append(addBundleClasspathEntries(libdir));
+ // OSGi manifest headers need to end with a line break
+ manifestSb.append("\n");
+ return manifestSb;
+ }
+
+ /**
+ * Add all libraries that don't have the scope "provided" to the "Bundle-Classpath".
+ */
+ protected String addBundleClasspathEntries(String libdir)
+ {
+ StringBuffer bundleClasspathSb = new StringBuffer(ENTRY_BUNDLE_CLASSPATH);
+ int countAddedLibs = 0;
+ for( int i = 0; i < this.deps.length; i++ )
+ {
+ if( !this.deps[i].isProvided() && !this.deps[i].isReferencedProject() )
+ {
+ if( countAddedLibs != 0 )
+ {
+ // TODO problems with line endings might appear
+ bundleClasspathSb.append(",\n");
+ }
+ System.out.println("artifact: " + this.deps[i].getArtifactId());
+ bundleClasspathSb.append(" " + libdir + "/" + this.deps[i].getFile().getName() + "");
+ countAddedLibs++;
+ }
+ }
+ // only insert the name of the property if there are local libraries
+ if( countAddedLibs > 0 ) {
+ return bundleClasspathSb.toString();
+ }
+ return "";
+ }
+
}
Propchange: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties?rev=433975&r1=433974&r2=433975&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties (original)
+++ cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties Wed Aug 23 01:25:01 2006
@@ -1,8 +1,8 @@
-sourcesnotavailable=\n Sources for some artifacts are not available.\n List of artifacts without a source archive:
-sourcesnotdownloaded=\n Sources for some artifacts are not available.\n Please run the same goal with the -DdownloadSources=true parameter in order to check remote repositories for sources.\n List of artifacts without a source archive:
-sourcesmissingitem=\n o {0}
-errorresolving=Error resolving {0} artifact. Artifact id: {1} (Message: {2})
-artifactresolution=An error occurred during dependency resolution of the following artifact:\n {0}:{1}:{2}\nCaused by: {3}
-artifactdownload=An error occurred during dependency resolution.\n Failed to retrieve {0}:{1}-{2}\nCaused by: {3}
-cantcanonicalize=Can''t canonicalize system path: {0}
+sourcesnotavailable=\n Sources for some artifacts are not available.\n List of artifacts without a source archive:
+sourcesnotdownloaded=\n Sources for some artifacts are not available.\n Please run the same goal with the -DdownloadSources=true parameter in order to check remote repositories for sources.\n List of artifacts without a source archive:
+sourcesmissingitem=\n o {0}
+errorresolving=Error resolving {0} artifact. Artifact id: {1} (Message: {2})
+artifactresolution=An error occurred during dependency resolution of the following artifact:\n {0}:{1}:{2}\nCaused by: {3}
+artifactdownload=An error occurred during dependency resolution.\n Failed to retrieve {0}:{1}-{2}\nCaused by: {3}
+cantcanonicalize=Can''t canonicalize system path: {0}
unabletoparseversion={0}: unable to parse version ''{1}'' for dependency ''{2}'': {3}
Propchange: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/tools/cocoon-maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java
------------------------------------------------------------------------------
svn:eol-style = native