You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2009/02/19 14:24:56 UTC
svn commit: r745852 - in /lenya/trunk:
org.apache.lenya.core.acusecases/src/main/resources/
org.apache.lenya.core.acusecases/src/main/resources/COB-INF/
org.apache.lenya.core.acusecases/src/main/resources/META-INF/
org.apache.lenya.core.acusecases/src/...
Author: andreas
Date: Thu Feb 19 13:24:55 2009
New Revision: 745852
URL: http://svn.apache.org/viewvc?rev=745852&view=rev
Log:
Starting to fix login usecase.
Added:
lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/
lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/
lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/sitemap.xmap
lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/
lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/
lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/
lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-blockServlet.xml
lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-components.xml
lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-api-components.xml
Modified:
lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java
lenya/trunk/org.apache.lenya.core.usecase/pom.xml
lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/sitemap.xmap
lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/usecases.js
lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/META-INF/cocoon/spring/lenya-core-usecase.xml
lenya/trunk/org.apache.lenya.parent/pom.xml
lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml
lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/sitemap.xmap
lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml
lenya/trunk/org.apache.lenya.webapp/pom.xml
lenya/trunk/org.apache.lenya.webapp/rcl.properties
Added: lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/sitemap.xmap?rev=745852&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/sitemap.xmap (added)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/sitemap.xmap Thu Feb 19 13:24:55 2009
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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"/>
Added: lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-blockServlet.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-blockServlet.xml?rev=745852&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-blockServlet.xml (added)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-blockServlet.xml Thu Feb 19 13:24:55 2009
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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
+ und
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+
+ <bean name="org.apache.lenya.core.acusecases.block" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/acusecases" context-path="blockcontext:/lenya-core-acusecases-2.2.0-SNAPSHOT/"/>
+ </bean>
+</beans>
Added: lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-components.xml?rev=745852&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-components.xml (added)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-components.xml Thu Feb 19 13:24:55 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"
+ xmlns="http://www.springframework.org/schema/beans">
+
+ <bean name="org.apache.lenya.cms.usecase.Usecase/ac.login"
+ class="org.apache.lenya.cms.ac.usecases.Login" scope="prototype" init-method="initialize">
+ <property name="repository" ref="org.apache.lenya.cms.publication.Repository"/>
+ <property name="accessControllerResolver" ref="org.apache.lenya.ac.AccessControllerResolver"/>
+ <property name="view" ref="loginView">
+ </property>
+ </bean>
+
+ <bean name="loginView" class="org.apache.lenya.cms.usecase.UsecaseView">
+ <property name="guiManager" ref="org.apache.lenya.cms.usecase.gui.GUIManager"/>
+ </bean>
+
+</beans>
Modified: lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java?rev=745852&r1=745851&r2=745852&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java (original)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/java/org/apache/lenya/cms/cocoon/flow/FlowHelperImpl.java Thu Feb 19 13:24:55 2009
@@ -30,7 +30,6 @@
import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.lenya.ac.AccessControlException;
import org.apache.lenya.cms.publication.Document;
-import org.apache.lenya.cms.publication.DocumentFactoryBuilder;
import org.apache.lenya.cms.publication.PageEnvelope;
import org.apache.lenya.cms.publication.PageEnvelopeException;
import org.apache.lenya.cms.publication.PageEnvelopeFactory;
@@ -50,20 +49,11 @@
public class FlowHelperImpl extends AbstractLogEnabled implements FlowHelper {
private Repository repository;
- private DocumentFactoryBuilder documentFactoryBuilder;
public void setRepository(Repository repository) {
this.repository = repository;
}
- public DocumentFactoryBuilder getDocumentFactoryBuilder() {
- return documentFactoryBuilder;
- }
-
- public void setDocumentFactoryBuilder(DocumentFactoryBuilder documentFactoryBuilder) {
- this.documentFactoryBuilder = documentFactoryBuilder;
- }
-
/**
* @see org.apache.lenya.cms.cocoon.flow.FlowHelper#getPageEnvelope(org.apache.cocoon.components.flow.javascript.fom.FOM_Cocoon)
*/
Added: lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-api-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-api-components.xml?rev=745852&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-api-components.xml (added)
+++ lenya/trunk/org.apache.lenya.core.api/src/main/resources/META-INF/cocoon/spring/lenya-core-api-components.xml Thu Feb 19 13:24:55 2009
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+ <bean name="org.apache.lenya.cms.cocoon.flow.FlowHelper"
+ class="org.apache.lenya.cms.cocoon.flow.FlowHelperImpl">
+ <property name="repository" ref="org.apache.lenya.cms.publication.Repository"/>
+ </bean>
+
+</beans>
Modified: lenya/trunk/org.apache.lenya.core.usecase/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/pom.xml?rev=745852&r1=745851&r2=745852&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/pom.xml Thu Feb 19 13:24:55 2009
@@ -59,6 +59,13 @@
<artifactId>cocoon-cron-impl</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-forms-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Lenya -->
+ <dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/sitemap.xmap?rev=745852&r1=745851&r2=745852&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/sitemap.xmap (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/sitemap.xmap Thu Feb 19 13:24:55 2009
@@ -6,9 +6,9 @@
The ASF licenses this file to You 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
-
+
+ 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.
@@ -18,12 +18,12 @@
<!-- $Id$ -->
<!--
- This sitemap handles calls to usecases which are registered in the
- usecase framework.
+ This sitemap handles calls to usecases which are registered in the
+ usecase framework.
-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
+
<map:components>
<map:transformers default="xslt">
<map:transformer name="browser-update" src="org.apache.cocoon.ajax.BrowserUpdateTransformer"/>
@@ -38,13 +38,13 @@
</map:components>
<!-- =========================== FlowScript =============================== -->
-
+
<map:flow language="javascript">
- <map:script src="fallback://lenya/modules/usecase/usecases.js"/>
+ <map:script src="usecases.js"/>
</map:flow>
<!-- =========================== Pipelines ================================ -->
-
+
<map:pipelines>
<map:pipeline type="noncaching" internal-only="true">
@@ -52,7 +52,7 @@
This internal pipeline renders the usecase, once the
executeUsecase() flowscript has completed and issued a redirect,
which is matched here.
- -->
+ -->
<map:match pattern="usecases-view/*/**">
<map:generate type="jx" src="fallback://lenya/{2}"/>
@@ -88,25 +88,34 @@
</map:when>
</map:select>
- <map:transform type="proxy"/>
+ <map:transform type="proxy-xhtml"/>
<map:transform src="fallback://lenya/xslt/util/strip_namespaces.xsl"/>
- <map:serialize type="xhtml"/>
-
- </map:match>
+ <map:serialize type="xml"/>
+
+ </map:match>
</map:pipeline>
-
+
<map:pipeline>
+
<map:match type="request-parameter" pattern="lenya.continuation">
<map:call continuation="{1}"/>
</map:match>
+
<map:match type="usecase" pattern="*">
<map:call function="executeUsecase">
<map:parameter name="usecaseName" value="{request-param:lenya.usecase}"/>
</map:call>
</map:match>
+
+ <map:match pattern="service/usecase/*">
+ <map:call function="executeUsecase">
+ <map:parameter name="usecaseName" value="{1}"/>
+ </map:call>
+ </map:match>
+
</map:pipeline>
</map:pipelines>
-
+
</map:sitemap>
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/usecases.js
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/usecases.js?rev=745852&r1=745851&r2=745852&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/usecases.js (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/COB-INF/usecases.js Thu Feb 19 13:24:55 2009
@@ -350,7 +350,6 @@
var preconditionsOK;
- try {
usecaseName = cocoon.parameters["usecaseName"];
usecase = getUsecase(usecaseName);
passRequestParameters(usecase);
@@ -366,6 +365,7 @@
}
proxy = new Packages.org.apache.lenya.cms.usecase.impl.UsecaseProxy(usecase);
log("debug", "Successfully prepared usecase.", usecaseName);
+ try {
} catch (exception) {
log("error", "Could not prepare usecase: " + exception, usecaseName);
throw exception;
Modified: lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/META-INF/cocoon/spring/lenya-core-usecase.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/META-INF/cocoon/spring/lenya-core-usecase.xml?rev=745852&r1=745851&r2=745852&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/META-INF/cocoon/spring/lenya-core-usecase.xml (original)
+++ lenya/trunk/org.apache.lenya.core.usecase/src/main/resources/META-INF/cocoon/spring/lenya-core-usecase.xml Thu Feb 19 13:24:55 2009
@@ -26,4 +26,16 @@
<property name="cache" ref="org.apache.lenya.ac.cache.SourceCache"/>
</bean>
+ <bean name="org.apache.lenya.cms.usecase.UsecaseResolver"
+ class="org.apache.lenya.cms.usecase.impl.UsecaseResolverImpl">
+ <property name="repository" ref="org.apache.lenya.cms.publication.Repository"/>
+ <property name="templateManager" ref="org.apache.lenya.cms.publication.templating.PublicationTemplateManager"/>
+ </bean>
+
+ <bean name="org.apache.lenya.cms.usecase.gui.GUIManager"
+ class="org.apache.lenya.cms.usecase.gui.impl.GUIManagerImpl">
+ <property name="repository" ref="org.apache.lenya.cms.publication.Repository"/>
+ <property name="usecaseResolver" ref="org.apache.lenya.cms.usecase.UsecaseResolver"/>
+ </bean>
+
</beans>
Modified: lenya/trunk/org.apache.lenya.parent/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.parent/pom.xml?rev=745852&r1=745851&r2=745852&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.parent/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.parent/pom.xml Thu Feb 19 13:24:55 2009
@@ -423,6 +423,11 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-ajax-impl</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-mail-impl</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
@@ -508,6 +513,11 @@
<artifactId>cocoon-chaperon-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-forms-impl</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </dependency>
<!-- Lenya -->
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=745852&r1=745851&r2=745852&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml Thu Feb 19 13:24:55 2009
@@ -63,6 +63,10 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-ajax-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-samples-style-default</artifactId>
</dependency>
@@ -73,6 +77,10 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-acusecases</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
<dependency>
Modified: lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/sitemap.xmap?rev=745852&r1=745851&r2=745852&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/sitemap.xmap (original)
+++ lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/COB-INF/sitemap.xmap Thu Feb 19 13:24:55 2009
@@ -48,7 +48,8 @@
<map:pipeline>
<map:match pattern="ac.login" type="usecase">
- <map:mount check-reload="yes" reload-method="synchron" src="{fallback:lenya/modules/usecase/usecase.xmap}" uri-prefix=""/>
+ <map:generate src="servlet:usecase:/service/usecase/ac.login"/>
+ <map:serialize type="xhtml"/>
</map:match>
<map:match pattern="ac.logout" type="usecase">
<map:mount check-reload="yes" reload-method="synchron" src="{fallback:lenya/modules/usecase/usecase.xmap}" uri-prefix=""/>
Modified: lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml?rev=745852&r1=745851&r2=745852&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml (original)
+++ lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml Thu Feb 19 13:24:55 2009
@@ -28,6 +28,7 @@
<servlet:context mount-path="/" context-path="blockcontext:/lenya-welcome-2.2.0-SNAPSHOT/">
<servlet:connections>
<entry key="gui" value-ref="org.apache.lenya.core.gui.block"/>
+ <entry key="usecase" value-ref="org.apache.lenya.core.usecase.block"/>
</servlet:connections>
</servlet:context>
</bean>
Modified: lenya/trunk/org.apache.lenya.webapp/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp/pom.xml?rev=745852&r1=745851&r2=745852&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.webapp/pom.xml Thu Feb 19 13:24:55 2009
@@ -74,6 +74,12 @@
-->
<webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
<contextPath>${jetty.context}</contextPath>
+ <systemProperties>
+ <systemProperty>
+ <name>org.mortbay.jetty.webapp.parentLoaderPriority</name>
+ <value>true</value>
+ </systemProperty>
+ </systemProperties>
</configuration>
</plugin>
<!--
@@ -115,7 +121,12 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-block-deployment</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-forms-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- Lenya -->
<dependency>
<groupId>org.apache.lenya</groupId>
Modified: lenya/trunk/org.apache.lenya.webapp/rcl.properties
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp/rcl.properties?rev=745852&r1=745851&r2=745852&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp/rcl.properties (original)
+++ lenya/trunk/org.apache.lenya.webapp/rcl.properties Thu Feb 19 13:24:55 2009
@@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+org.apache.lenya.core.acusecases.block%classes-dir=../org.apache.lenya.core.acusecases/target/classes
org.apache.lenya.core.gui.block%classes-dir=../org.apache.lenya.core.gui/target/classes
+org.apache.lenya.core.usecase.block%classes-dir=../org.apache.lenya.core.usecase/target/classes
org.apache.lenya.module.prettyprinting.block%classes-dir=../org.apache.lenya.module.prettyprinting/target/classes
org.apache.lenya.webapp.welcome.block%classes-dir=../org.apache.lenya.webapp.welcome/target/classes
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org