You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/10/25 01:16:45 UTC
svn commit: r588078 - in /cocoon/trunk/blocks:
cocoon-javaflow/cocoon-javaflow-impl/src/main/resources/META-INF/cocoon/avalon/
cocoon-jms/cocoon-jms-impl/src/main/resources/META-INF/cocoon/avalon/
cocoon-jsp/cocoon-jsp-impl/src/main/resources/META-INF/...
Author: vgritsenko
Date: Wed Oct 24 16:16:34 2007
New Revision: 588078
URL: http://svn.apache.org/viewvc?rev=588078&view=rev
Log:
removing logger attribute
Modified:
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-javaflow.xconf
cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-jms.xconf
cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-jsp.xconf
cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-linkrewriter.xconf
cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-mail.xconf
cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-ojb.xconf
Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-javaflow.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-javaflow.xconf?rev=588078&r1=588077&r2=588078&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-javaflow.xconf (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-javaflow.xconf Wed Oct 24 16:16:34 2007
@@ -16,12 +16,11 @@
limitations under the License.
-->
-<!--+
- |
- | SVN $Id$
- +-->
+<!--
+ - $Id$
+ -->
<components>
<flow-interpreters>
- <component-instance name="java" class="org.apache.cocoon.components.flow.java.JavaInterpreter" logger="flow"/>
+ <component-instance name="java" class="org.apache.cocoon.components.flow.java.JavaInterpreter"/>
</flow-interpreters>
</components>
Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-jms.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-jms.xconf?rev=588078&r1=588077&r2=588078&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-jms.xconf (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-jms.xconf Wed Oct 24 16:16:34 2007
@@ -16,10 +16,9 @@
limitations under the License.
-->
-<!--+
- |
- | SVN $Id$
- +-->
+<!--
+ - $Id$
+ -->
<components>
<!-- Include roles -->
<include src="resource://org/apache/cocoon/components/jms/jms.roles"/>
@@ -46,7 +45,7 @@
| - auto-reconnect-delay: the amount of time in ms between reconnection attempts.
| Only applies when auto-reconnect is on. Defaults to 1000ms.
+ -->
- <jms-connection-manager logger="core.jms">
+ <jms-connection-manager>
<topic-connection name="local-topics">
<parameter name="java.naming.factory.initial" value="org.exolab.jms.jndi.InitialContextFactory"/>
<parameter name="java.naming.provider.url" value="rmi://localhost:1099/"/>
Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-jsp.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-jsp.xconf?rev=588078&r1=588077&r2=588078&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-jsp.xconf (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-jsp.xconf Wed Oct 24 16:16:34 2007
@@ -16,35 +16,34 @@
limitations under the License.
-->
-<!--+
- |
- | SVN $Id$
- +-->
+<!--
+ - $Id$
+ -->
<components>
<!-- Include roles -->
<include src="resource://org/apache/cocoon/components/jsp/jsp.roles"/>
- <!-- JSP Engine:
- The JSPGenerator and JSPReader select a JSPEngine component. The JSPEngine component
- launches a JSP servlet engine of your servlet container, feeds the
- HttpRequest into the JSP servlet engine, and pipes the jsp response as
- SAX events into Cocoon2. The JSP page is specified by the HttpRequest.
- This way you can continue to use your JSP pages. Your migration from JSP
- to XSP may be done step by step. You may specify your JSP pages either as
- JSP scriptlets or as JSP-XML. But keep in mind that your JSP output should
- be valid XML.
- -->
- <jsp-engine logger="core.jsp-engine">
+ <!--
+ - JSP Engine:
+ - The JSPGenerator and JSPReader select a JSPEngine component. The JSPEngine component
+ - launches a JSP servlet engine of your servlet container, feeds the
+ - HttpRequest into the JSP servlet engine, and pipes the jsp response as
+ - SAX events into Cocoon2. The JSP page is specified by the HttpRequest.
+ - This way you can continue to use your JSP pages. Your migration from JSP
+ - to XSP may be done step by step. You may specify your JSP pages either as
+ - JSP scriptlets or as JSP-XML. But keep in mind that your JSP output should
+ - be valid XML.
+ -->
+ <jsp-engine>
<parameter name="servlet-class" value="org.apache.jasper.servlet.JspServlet"/>
</jsp-engine>
<!--
- Alternative implementation that uses a RequestDispatcher for running named Servlets.
- -->
- <!--
- <jsp-engine logger="core.jsp-engine" class="org.apache.cocoon.components.jsp.JSPEngineImplNamedDispatcherInclude">
+ - Alternative implementation that uses a RequestDispatcher for running named Servlets.
+ -
+ <jsp-engine class="org.apache.cocoon.components.jsp.JSPEngineImplNamedDispatcherInclude">
<parameter name="servlet-name" value="*.jsp"/>
<parameter name="forward" value="false"/>
</jsp-engine>
- -->
+ -->
</components>
Modified: cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-linkrewriter.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-linkrewriter.xconf?rev=588078&r1=588077&r2=588078&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-linkrewriter.xconf (original)
+++ cocoon/trunk/blocks/cocoon-linkrewriter/cocoon-linkrewriter-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-linkrewriter.xconf Wed Oct 24 16:16:34 2007
@@ -16,34 +16,35 @@
limitations under the License.
-->
-<!--+
- |
- | SVN $Id$
- +-->
+<!--
+ - $Id$
+ -->
<components>
<input-modules>
-
<!-- For the sitedemo sample -->
- <component-instance class="org.apache.cocoon.components.modules.input.XMLFileModule" logger="core.modules.xml" name="linkmap">
- <file src="cocoon://samples/linkrewriter/sitedemo/linkmap" />
+ <component-instance name="linkmap"
+ class="org.apache.cocoon.components.modules.input.XMLFileModule">
+ <file src="cocoon://samples/linkrewriter/sitedemo/linkmap"/>
<!-- Shouldn't this be the default? -->
<reloadable>true</reloadable>
</component-instance>
- <component-instance class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule" logger="core.modules.mapper" name="site">
- <input-module name="linkmap" />
+ <component-instance name="site"
+ class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule">
+ <input-module name="linkmap"/>
<prefix>/site/</prefix>
<suffix>/@href</suffix>
</component-instance>
<!-- For the bookdemo sample -->
- <component-instance class="org.apache.cocoon.components.modules.input.XMLFileModule" logger="core.modules.xml" name="book-raw">
+ <component-instance name="book-raw"
+ class="org.apache.cocoon.components.modules.input.XMLFileModule">
<!-- Shouldn't this be the default? -->
- <file src="cocoon://samples/linkrewriter/bookdemo/linkmap" />
+ <file src="cocoon://samples/linkrewriter/bookdemo/linkmap"/>
<reloadable>true</reloadable>
</component-instance>
- <component-instance class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule" logger="core.modules.mapper" name="book">
- <input-module name="book-raw" />
+ <component-instance name="book"
+ class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule">
+ <input-module name="book-raw"/>
</component-instance>
-
</input-modules>
</components>
Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-mail.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-mail.xconf?rev=588078&r1=588077&r2=588078&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-mail.xconf (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-mail.xconf Wed Oct 24 16:16:34 2007
@@ -16,22 +16,21 @@
limitations under the License.
-->
-<!--+
- |
- | SVN $Id$
- +-->
+<!--
+ - $Id$
+ -->
<components>
- <!--+
- | Component for simplified mail sending.
- +-->
+ <!--
+ - Component for simplified mail sending.
+ -->
<component role="org.apache.cocoon.mail.MailSender"
- class="org.apache.cocoon.mail.MailMessageSender"
- logger="core.mail.MailSender">
- <!--+
- | SMTP host name, user name, and password.
- <smtp-host>127.0.0.1</smtp-host>
- <smtp-user>john</smtp-user>
- <smtp-password>john</smtp-password>
- +-->
+ class="org.apache.cocoon.mail.MailMessageSender">
+ <!--
+ - SMTP host name, user name, and password.
+ -
+ <smtp-host>127.0.0.1</smtp-host>
+ <smtp-user>john</smtp-user>
+ <smtp-password>john</smtp-password>
+ -->
</component>
</components>
Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-ojb.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-ojb.xconf?rev=588078&r1=588077&r2=588078&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-ojb.xconf (original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/src/main/resources/META-INF/cocoon/avalon/cocoon-ojb.xconf Wed Oct 24 16:16:34 2007
@@ -16,25 +16,23 @@
limitations under the License.
-->
-<!--+
- |
- | SVN $Id$
- +-->
+<!--
+ - $Id$
+ -->
<components>
<!-- Include roles -->
<include src="resource://org/apache/cocoon/ojb/ojb.roles"/>
<!-- OJB Connection Factory -->
<component role="org.apache.cocoon.ojb.components.ConnectionFactory"
- class="org.apache.cocoon.ojb.components.ConnectionFactoryImpl"
- logger="core.ojb"/>
+ class="org.apache.cocoon.ojb.components.ConnectionFactoryImpl"/>
<!-- OJB Persistent Manager Factory for JDO.
Requires javax.jdo package.
- <ojb-jdo logger="core.ojb.jdo"/>
+ <ojb-jdo/>
-->
<!-- OJB ODMG Implementation Interface -->
- <ojb-odmg logger="core.ojb.odmg"/>
+ <ojb-odmg/>
</components>