You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/04/10 13:32:13 UTC
svn commit: r392923 - in /cocoon/trunk/blocks: ./ cocoon-apples/
cocoon-apples/cocoon-apples-impl/
cocoon-apples/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/
cocoon-apples/cocoon-apples-sample/ cocoon-asciiart/ cocoon-asci...
Author: cziegeler
Date: Mon Apr 10 04:32:10 2006
New Revision: 392923
URL: http://svn.apache.org/viewcvs?rev=392923&view=rev
Log:
Add some blocks to build
Modified:
cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
cocoon/trunk/blocks/cocoon-apples/pom.xml
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
cocoon/trunk/blocks/cocoon-asciiart/pom.xml
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml
cocoon/trunk/blocks/cocoon-authentication-fw/pom.xml
cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/pom.xml
cocoon/trunk/blocks/cocoon-axis/pom.xml
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
cocoon/trunk/blocks/cocoon-session-fw/pom.xml
cocoon/trunk/blocks/pom.xml
Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml Mon Apr 10 04:32:10 2006
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-apples</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/src/main/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java Mon Apr 10 04:32:10 2006
@@ -19,12 +19,9 @@
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.WrapperComponentManager;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.components.LifecycleHelper;
import org.apache.cocoon.components.flow.AbstractInterpreter;
@@ -39,11 +36,9 @@
* ApplesProcessor is the core Cocoon component that provides the 'Apples'
* flow implementation.
*/
-public class ApplesProcessor extends AbstractInterpreter implements Serviceable, ContinuationsDisposer {
-
-
- private ServiceManager serviceManager;
-
+public class ApplesProcessor
+ extends AbstractInterpreter
+ implements ContinuationsDisposer {
public void callFunction(
String className,
@@ -74,9 +69,7 @@
throw new CascadingRuntimeException("Cannot get sitemap service manager", e);
}
- LifecycleHelper.setupComponent( app, getLogger(), appleContext,
- sitemapManager, new WrapperComponentManager(sitemapManager),
- null, null, true);
+ LifecycleHelper.setupComponent( app, getLogger(), appleContext, sitemapManager, null, true);
processApple(params, redirector, app, wk);
}
@@ -171,12 +164,4 @@
}
}
-
-
- public void service(ServiceManager serviceManager) throws ServiceException {
- super.service(serviceManager);
- this.serviceManager = serviceManager;
- }
-
-
}
Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml Mon Apr 10 04:32:10 2006
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-apples</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-apples/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-apples/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/pom.xml Mon Apr 10 04:32:10 2006
@@ -25,14 +25,14 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-blocks-modules</artifactId>
- <version>x-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-apples</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml Mon Apr 10 04:32:10 2006
@@ -15,14 +15,14 @@
limitations under the License.
-->
<!--+
- | @version $Id:$
+ | @version $Id$
|
+-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-asciiart</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml Mon Apr 10 04:32:10 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | @version $Id:$
+ | @version $Id$
+-->
<project
xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-asciiart</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-asciiart/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-asciiart/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/pom.xml Mon Apr 10 04:32:10 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | @version $Id:$
+ | @version $Id$
+-->
<project
xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,15 +24,15 @@
<parent>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>cocoon-blocks-modules</artifactId>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-asciiart</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/pom.xml Mon Apr 10 04:32:10 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-authentication-fw</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-authentication-fw-impl</artifactId>
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-sample/pom.xml Mon Apr 10 04:32:10 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-authentication-fw</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-authentication-fw-sample</artifactId>
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-authentication-fw/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/pom.xml Mon Apr 10 04:32:10 2006
@@ -20,16 +20,16 @@
+-->
<project>
<parent>
- <artifactId>cocoon</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <artifactId>cocoon-blocks-modules</artifactId>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-authentication-fw</artifactId>
<packaging>pom</packaging>
<name>Authentication Framework</name>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
<modules>
<module>cocoon-authentication-fw-impl</module>
<module>cocoon-authentication-fw-sample</module>
Modified: cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml Mon Apr 10 04:32:10 2006
@@ -15,14 +15,14 @@
limitations under the License.
-->
<!--+
- | @version $Id:$
+ | @version $Id$
|
+-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-axis</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/pom.xml Mon Apr 10 04:32:10 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | @version $Id:$
+ | @version $Id$
+-->
<project
xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-axis</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-axis/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-axis/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-axis/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-axis/pom.xml Mon Apr 10 04:32:10 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | @version $Id:$
+ | @version $Id$
+-->
<project
xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,15 +24,15 @@
<parent>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>cocoon-blocks-modules</artifactId>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-axis</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml Mon Apr 10 04:32:10 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-session-fw</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-session-fw-impl</artifactId>
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml Mon Apr 10 04:32:10 2006
@@ -23,7 +23,7 @@
<parent>
<artifactId>cocoon-session-fw</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-session-fw-sample</artifactId>
Modified: cocoon/trunk/blocks/cocoon-session-fw/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-session-fw/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/pom.xml Mon Apr 10 04:32:10 2006
@@ -18,18 +18,23 @@
| @version $Id$
|
+-->
-<project>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<parent>
- <artifactId>cocoon</artifactId>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cocoon</groupId>
+
<artifactId>cocoon-session-fw</artifactId>
+ <version>1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Session Framework</name>
- <version>1.0-SNAPSHOT</version>
<modules>
<module>cocoon-session-fw-impl</module>
<module>cocoon-session-fw-sample</module>
Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/pom.xml?rev=392923&r1=392922&r2=392923&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Mon Apr 10 04:32:10 2006
@@ -39,14 +39,14 @@
<modules>
<module>cocoon-ajax</module>
- <!--module>cocoon-apples</module
+ <module>cocoon-apples</module>
<module>cocoon-asciiart</module>
<module>cocoon-authentication-fw</module>
<module>cocoon-axis</module>
- <module>cocoon-batik</module>
+ <!-- module>cocoon-batik</module>
<module>cocoon-bsf</module -->
<module>cocoon-captcha</module>
- <!--module>cocoon-chaperon</module>
+ <!-- module>cocoon-chaperon</module>
<module>cocoon-core-samples-additional</module>
<module>cocoon-core-samples-main</module>
<module>cocoon-cron</module>
@@ -55,7 +55,7 @@
<module>cocoon-faces</module-->
<module>cocoon-fop</module>
<module>cocoon-forms</module>
- <!--module>cocoon-hsqldb</module>
+ <!-- module>cocoon-hsqldb</module>
<module>cocoon-html</module>
<module>cocoon-itext</module>
<module>cocoon-javaflow</module>
@@ -80,8 +80,9 @@
<module>cocoon-querybean</module>
<module>cocoon-repository</module>
<module>cocoon-scratchpad</module>
- <module>cocoon-serializers</module>
- <module>cocoon-slide</module>
+ <module>cocoon-serializers</module -->
+ <module>cocoon-session-fw</module>
+ <!-- module>cocoon-slide</module>
<module>cocoon-slop</module>
<module>cocoon-stx</module>
<module>cocoon-taglib</module>
@@ -90,6 +91,6 @@
<module>cocoon-velocity</module>
<module>cocoon-web3</module>
<module>cocoon-webdav</module>
- <module>cocoon-xsp</module-->
+ <module>cocoon-xsp</module -->
</modules>
</project>