You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by fl...@apache.org on 2010/09/20 18:25:12 UTC
svn commit: r998986 - in /lenya/trunk: org.apache.lenya.core.api/
org.apache.lenya.core.properties/src/main/resources/
org.apache.lenya.core.properties/src/main/resources/META-INF/
org.apache.lenya.core.properties/src/main/resources/META-INF/cocoon/ or...
Author: florent
Date: Mon Sep 20 16:25:12 2010
New Revision: 998986
URL: http://svn.apache.org/viewvc?rev=998986&view=rev
Log:
- solve the properties input module
Added:
lenya/trunk/org.apache.lenya.core.properties/src/main/resources/
lenya/trunk/org.apache.lenya.core.properties/src/main/resources/META-INF/
lenya/trunk/org.apache.lenya.core.properties/src/main/resources/META-INF/cocoon/
lenya/trunk/org.apache.lenya.core.properties/src/main/resources/META-INF/cocoon/avalon/
lenya/trunk/org.apache.lenya.core.properties/src/main/resources/META-INF/cocoon/avalon/lenya-core-properties-input-module.xconf
- copied, changed from r998190, lenya/tags/RELEASE_2_0_3/src/modules-core/properties/config/cocoon-xconf/properties-input-module.xconf
Modified:
lenya/trunk/org.apache.lenya.core.api/pom.xml
lenya/trunk/org.apache.lenya.parent/pom.xml
lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml
Modified: lenya/trunk/org.apache.lenya.core.api/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/pom.xml?rev=998986&r1=998985&r2=998986&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.api/pom.xml Mon Sep 20 16:25:12 2010
@@ -105,6 +105,11 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-chaperon-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-xsp-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
<!-- Tests -->
<dependency>
Copied: lenya/trunk/org.apache.lenya.core.properties/src/main/resources/META-INF/cocoon/avalon/lenya-core-properties-input-module.xconf (from r998190, lenya/tags/RELEASE_2_0_3/src/modules-core/properties/config/cocoon-xconf/properties-input-module.xconf)
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.properties/src/main/resources/META-INF/cocoon/avalon/lenya-core-properties-input-module.xconf?p2=lenya/trunk/org.apache.lenya.core.properties/src/main/resources/META-INF/cocoon/avalon/lenya-core-properties-input-module.xconf&p1=lenya/tags/RELEASE_2_0_3/src/modules-core/properties/config/cocoon-xconf/properties-input-module.xconf&r1=998190&r2=998986&rev=998986&view=diff
==============================================================================
--- lenya/tags/RELEASE_2_0_3/src/modules-core/properties/config/cocoon-xconf/properties-input-module.xconf (original)
+++ lenya/trunk/org.apache.lenya.core.properties/src/main/resources/META-INF/cocoon/avalon/lenya-core-properties-input-module.xconf Mon Sep 20 16:25:12 2010
@@ -16,12 +16,11 @@
limitations under the License.
-->
-<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
-<!--
- This file defines the publication specific use-cases
--->
-
- <xconf xpath="/cocoon/input-modules" unless="/cocoon/input-modules/component-instance[@name = 'properties']">
+<components>
+
+ <input-modules>
<component-instance logger="core.modules.input.properties" name="properties"
- class="org.apache.lenya.cms.cocoon.components.modules.input.PropertiesModule"/>
- </xconf>
+ class="org.apache.lenya.cms.cocoon.components.modules.input.PropertiesModule"/>
+
+ </input-modules>
+</components>
Modified: lenya/trunk/org.apache.lenya.parent/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.parent/pom.xml?rev=998986&r1=998985&r2=998986&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.parent/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.parent/pom.xml Mon Sep 20 16:25:12 2010
@@ -660,6 +660,11 @@
<artifactId>lenya-core-workflow</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-properties</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- Modules -->
<dependency>
Modified: lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml?rev=998986&r1=998985&r2=998986&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml Mon Sep 20 16:25:12 2010
@@ -116,5 +116,9 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-sourcerepository</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-properties</artifactId>
+ </dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org