svn commit: r747186 - in /lenya/trunk: org.apache.lenya.core.gui/ org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/ org.apache.lenya.webapp.welcome/ org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spri...

Author: andreas
Date: Mon Feb 23 22:55:03 2009
New Revision: 747186

URL: http://svn.apache.org/viewvc?rev=747186&view=rev
Log:
Fixed various dependency and block name issues.

Modified:
    lenya/trunk/org.apache.lenya.core.gui/pom.xml
    lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/lenya-module-prettyprinting-blockServlet.xml
    lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml
    lenya/trunk/org.apache.lenya.webapp.welcome/src/main/resources/META-INF/cocoon/spring/lenya-welcome-blockServlet.xml
    lenya/trunk/org.apache.lenya.webapp/rcl.properties

Modified: lenya/trunk/org.apache.lenya.core.gui/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.gui/pom.xml?rev=747186&r1=747185&r2=747186&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.gui/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.gui/pom.xml Mon Feb 23 22:55:03 2009
@@ -23,5 +23,9 @@
       <groupId>org.apache.lenya</groupId>
       <artifactId>lenya-core-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-module-prettyprinting</artifactId>
+    </dependency>
   </dependencies>
 </project>

Modified: lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/lenya-module-prettyprinting-blockServlet.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/lenya-module-prettyprinting-blockServlet.xml?rev=747186&r1=747185&r2=747186&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/lenya-module-prettyprinting-blockServlet.xml (original)
+++ lenya/trunk/org.apache.lenya.module.prettyprinting/src/main/resources/META-INF/cocoon/spring/lenya-module-prettyprinting-blockServlet.xml Mon Feb 23 22:55:03 2009
@@ -25,6 +25,6 @@
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
   <bean name="org.apache.lenya.module.prettyprinting.block" class="org.apache.cocoon.sitemap.SitemapServlet">
-    <servlet:context mount-path="/prettyprinting" context-path="blockcontext:/lenya-module-prettyprinting"/>
+    <servlet:context mount-path="/prettyprinting" context-path="blockcontext:/lenya-module-prettyprinting-2.2.0-SNAPSHOT/"/>
   </bean>
 </beans>

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=747186&r1=747185&r2=747186&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.webapp.welcome/pom.xml Mon Feb 23 22:55:03 2009
@@ -89,6 +89,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-gui</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
       <artifactId>lenya-core-impl</artifactId>
       <scope>runtime</scope>
     </dependency>

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=747186&r1=747185&r2=747186&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 Mon Feb 23 22:55:03 2009
@@ -25,7 +25,7 @@
                            http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
 
   <bean name="org.apache.lenya.webapp.welcome.block" class="org.apache.cocoon.sitemap.SitemapServlet">
-    <servlet:context mount-path="/" context-path="blockcontext:/lenya-welcome-2.2.0-SNAPSHOT/">
+    <servlet:context mount-path="/" context-path="blockcontext:/lenya-webapp-welcome-2.2.0-SNAPSHOT/">
       <servlet:connections>
         <entry key="acusecases" value-ref="org.apache.lenya.core.acusecases.block"/>
         <entry key="gui" value-ref="org.apache.lenya.core.gui.block"/>

Modified: lenya/trunk/org.apache.lenya.webapp/rcl.properties
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.webapp/rcl.properties?rev=747186&r1=747185&r2=747186&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.webapp/rcl.properties (original)
+++ lenya/trunk/org.apache.lenya.webapp/rcl.properties Mon Feb 23 22:55:03 2009
@@ -18,5 +18,5 @@
 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.module.svg.block%classes-dir=../org.apache.lenya.module.svg/target/classes
+org.apache.lenya.module.svg.block%classes-dir=../org.apache.lenya.module.svg/target/classes
 org.apache.lenya.webapp.welcome.block%classes-dir=../org.apache.lenya.webapp.welcome/target/classes