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/15 00:49:55 UTC
svn commit: r394222 - in /cocoon/trunk/blocks: ./
cocoon-scratchpad/cocoon-scratchpad-impl/
cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/
cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/ant/
c...
Author: cziegeler
Date: Fri Apr 14 15:49:51 2006
New Revision: 394222
URL: http://svn.apache.org/viewcvs?rev=394222&view=rev
Log:
Add scratchpad block
Removed:
cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/acting/FlowAction.java
Modified:
cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/ant/CocoonTask.java
cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/JellyGenerator.java
cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/test/resources/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest
cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml
cocoon/trunk/blocks/pom.xml
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml?rev=394222&r1=394221&r2=394222&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml Fri Apr 14 15:49:51 2006
@@ -63,6 +63,11 @@
<version>0.6</version>
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly</artifactId>
<version>1.0</version>
@@ -83,6 +88,11 @@
<artifactId>castor</artifactId>
<version>0.9.7</version>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.02</version>
+ </dependency>
<!--
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -91,4 +101,20 @@
</dependency>
-->
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.class</include>
+ <include>**/*Test.class</include>
+ </includes>
+ <excludes>
+ <exclude>**/CachingSourceTestCase.class</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/ant/CocoonTask.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/ant/CocoonTask.java?rev=394222&r1=394221&r2=394222&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/ant/CocoonTask.java (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/ant/CocoonTask.java Fri Apr 14 15:49:51 2006
@@ -23,13 +23,10 @@
import java.util.Set;
import java.util.StringTokenizer;
-import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
-
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
@@ -38,7 +35,6 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.Cocoon;
@@ -48,9 +44,6 @@
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.SystemUtils;
-import org.apache.log.Hierarchy;
-import org.apache.log.Priority;
-
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -540,7 +533,6 @@
public static class CocoonFactory extends AbstractLogEnabled
implements Contextualizable, Configurable {
- private LogKitLoggerManager logKitLoggerManager;
private Logger logger;
private DefaultContext ctx;
@@ -576,7 +568,6 @@
File workDir = (File) this.ctx.get(Constants.CONTEXT_WORK_DIR);
CommandLineContext clContext = new CommandLineContext(contextDir.toString());
- clContext.enableLogging(getLogger());
this.ctx.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, clContext);
this.ctx.put(Constants.CONTEXT_CLASSPATH, getClassPath(contextDir));
@@ -603,39 +594,8 @@
logLevel = "WARN";
}
- // configure the logKitLoggerManager,
- // either by using a logkit.xconf file or by a logger
- final Priority priority = Priority.getPriorityForName(logLevel);
- Hierarchy.getDefaultHierarchy().setDefaultPriority(priority);
- this.logger = new LogKitLogger(Hierarchy.getDefaultHierarchy().getLoggerFor(""));
-
- child = configuration.getChild("logKit", false);
- if (child != null) {
- String logKit = child.getValue();
- String logKitLogCategory = child.getAttribute("category", "cocoon");
-
- if (logKit != null) {
- try {
- final DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
- final Configuration logKitConf = builder.buildFromFile(logKit);
- this.logKitLoggerManager = new LogKitLoggerManager(Hierarchy.getDefaultHierarchy());
-
- final DefaultContext subcontext = new DefaultContext(this.ctx);
- this.logKitLoggerManager.contextualize(subcontext);
- this.logKitLoggerManager.configure(logKitConf);
- logger = this.logKitLoggerManager.getLoggerForCategory(logKitLogCategory);
- } catch (Exception e) {
- getLogger().error("Cannot initialize log-kit-manager from logkit-xconf " + String.valueOf(logKit));
- // clean logKitLoggerManager, try init it without the logkit-xconf
- this.logKitLoggerManager = null;
- }
- }
- }
-
- if (this.logKitLoggerManager == null) {
- this.logKitLoggerManager = new LogKitLoggerManager(Hierarchy.getDefaultHierarchy());
- this.logKitLoggerManager.enableLogging(logger);
- }
+ // FIXME - Use different logger or level?
+ this.logger = new ConsoleLogger();
}
@@ -648,11 +608,7 @@
* @exception Exception thrown if initializing of Cocoon instance fails
*/
public Cocoon createCocoon() throws Exception, ContextException, ConfigurationException {
- Cocoon cocoon = new Cocoon();
- cocoon.enableLogging(logger);
- cocoon.contextualize(this.ctx);
- cocoon.setLoggerManager(logKitLoggerManager);
- cocoon.initialize();
+ Cocoon cocoon = new Cocoon(null, null, this.ctx, this.logger);
return cocoon;
}
@@ -665,9 +621,6 @@
* @param cocoon the Cocoon instance
*/
public void disposeCocoon(Cocoon cocoon) {
- if (cocoon != null) {
- cocoon.dispose();
- }
}
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/JellyGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/JellyGenerator.java?rev=394222&r1=394221&r2=394222&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/JellyGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/JellyGenerator.java Fri Apr 14 15:49:51 2006
@@ -29,7 +29,7 @@
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.commons.jelly.impl.XMLParser;
+import org.apache.commons.jelly.parser.XMLParser;
import org.apache.excalibur.source.Source;
import org.xml.sax.SAXException;
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/test/resources/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/test/resources/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest?rev=394222&r1=394221&r2=394222&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/test/resources/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/test/resources/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest Fri Apr 14 15:49:51 2006
@@ -19,8 +19,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
- default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"
- />
+ default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
@@ -55,16 +54,6 @@
<role name="org.apache.cocoon.components.cron.CronJob/UpdateTarget"
shorthand="update-target"
default-class="org.apache.cocoon.components.source.impl.UpdateTarget"
- />
-
- <role name="org.apache.cocoon.components.sax.XMLSerializer"
- shorthand="xml-serializer"
- default-class="org.apache.cocoon.components.sax.XMLByteStreamCompiler"
- />
-
- <role name="org.apache.cocoon.components.sax.XMLDeserializer"
- shorthand="xml-deserializer"
- default-class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"
/>
<role name="org.apache.excalibur.xml.sax.SAXParser"
Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml?rev=394222&r1=394221&r2=394222&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/pom.xml Fri Apr 14 15:49:51 2006
@@ -55,7 +55,7 @@
<dependency>
<groupId>commons-transaction</groupId>
<artifactId>commons-transaction</artifactId>
- <version>1.0.1</version>
+ <version>1.1</version>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/pom.xml?rev=394222&r1=394221&r2=394222&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Fri Apr 14 15:49:51 2006
@@ -79,7 +79,7 @@
<module>cocoon-qdox</module>
<module>cocoon-querybean</module>
<module>cocoon-repository</module>
- <!-- module>cocoon-scratchpad</module -->
+ <module>cocoon-scratchpad</module>
<module>cocoon-serializers</module>
<module>cocoon-session-fw</module>
<module>cocoon-slide</module>