You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by fe...@apache.org on 2007/03/27 11:08:42 UTC
svn commit: r522822 - in /cocoon/trunk/blocks/cocoon-asciiart:
cocoon-asciiart-impl/src/main/resources/META-INF/cocoon/avalon/
cocoon-asciiart-impl/src/main/resources/META-INF/cocoon/spring/
cocoon-asciiart-sample/ cocoon-asciiart-sample/src/main/resou...
Author: felixk
Date: Tue Mar 27 02:08:40 2007
New Revision: 522822
URL: http://svn.apache.org/viewvc?view=rev&rev=522822
Log:
migrate avalon configuration to spring configuration
fix batik dependency
Added:
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart.xml (with props)
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml (with props)
Removed:
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/main/resources/META-INF/cocoon/avalon/
Modified:
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
Added: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart.xml?view=auto&rev=522822
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart.xml (added)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart.xml Tue Mar 27 02:08:40 2007
@@ -0,0 +1,33 @@
+<?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.
+-->
+<!--+
+ | This is the configuration for the standard application manager.
+ |
+ | @version $Id$
+ +-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+ <bean name="org.apache.cocoon.generation.Generator/asciiart-svg"
+ class="org.apache.cocoon.generation.asciiart.AsciiArtSVGGenerator"
+ scope="prototype" />
+
+</beans>
\ No newline at end of file
Propchange: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml?view=diff&rev=522822&r1=522821&r2=522822
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml Tue Mar 27 02:08:40 2007
@@ -40,5 +40,10 @@
<artifactId>cocoon-asciiart-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-batik-impl</artifactId>
+ <version>1.0.0-RC1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Added: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml?view=auto&rev=522822
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml (added)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml Tue Mar 27 02:08:40 2007
@@ -0,0 +1,29 @@
+<?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.
+-->
+
+<!-- @version $Id$ -->
+<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.xsd
+ http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+
+ <bean id="org.apache.cocoon.asciiart.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-asciiart-sample" context-path="blockcontext:/cocoon-asciiart-sample/"/>
+ </bean>
+</beans>
Propchange: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/META-INF/cocoon/spring/cocoon-asciiart-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id