You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/10/17 05:10:58 UTC
svn commit: r585341 - in
/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples:
BindingWoodyApple.java CalculationApple.java GuessGameApple.java
HanoiApple.java
Author: vgritsenko
Date: Tue Oct 16 20:10:57 2007
New Revision: 585341
URL: http://svn.apache.org/viewvc?rev=585341&view=rev
Log:
use new abstractlogenabled - commons logging
Modified:
cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java
cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/CalculationApple.java
cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/GuessGameApple.java
cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/HanoiApple.java
Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java?rev=585341&r1=585340&r2=585341&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java Tue Oct 16 20:10:57 2007
@@ -21,7 +21,6 @@
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
@@ -29,7 +28,6 @@
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
@@ -43,11 +41,13 @@
import org.apache.cocoon.forms.binding.BindingManager;
import org.apache.cocoon.forms.formmodel.Form;
import org.apache.cocoon.forms.transformation.FormsPipelineConfig;
+import org.apache.cocoon.util.AbstractLogEnabled;
import org.apache.cocoon.xml.dom.DOMStreamer;
import org.apache.excalibur.source.ModifiableSource;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.xml.dom.DOMParser;
+
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
@@ -124,7 +124,7 @@
this.document = loadDocumentFromSource(documentSource);
this.binding.loadFormFromModel(this.form, this.document);
- this.getLogger().debug("apple initialisation finished .. ");
+ getLogger().debug("apple initialisation finished .. ");
this.state = validationDelegate;
completeResult(res, this.formPipeURI, CONTINUE);
@@ -137,16 +137,16 @@
if (binderManager != null) {
this.serviceManager.release(binderManager);
}
+ if (formSource != null) {
+ resolver.release(formSource);
+ }
+ if (bindSource != null) {
+ resolver.release(bindSource);
+ }
+ if (documentSource != null) {
+ resolver.release(documentSource);
+ }
if (resolver != null) {
- if (formSource != null) {
- resolver.release(formSource);
- }
- if (bindSource != null) {
- resolver.release(bindSource);
- }
- if (documentSource != null) {
- resolver.release(documentSource);
- }
this.serviceManager.release(resolver);
}
}
Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/CalculationApple.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/CalculationApple.java?rev=585341&r1=585340&r2=585341&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/CalculationApple.java (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/CalculationApple.java Tue Oct 16 20:10:57 2007
@@ -20,11 +20,11 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.flow.apples.AppleController;
import org.apache.cocoon.components.flow.apples.AppleRequest;
import org.apache.cocoon.components.flow.apples.AppleResponse;
+import org.apache.cocoon.util.AbstractLogEnabled;
/**
* CalculationApple shows an easy Apple example implementation for a Calculator.
Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/GuessGameApple.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/GuessGameApple.java?rev=585341&r1=585340&r2=585341&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/GuessGameApple.java (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/GuessGameApple.java Tue Oct 16 20:10:57 2007
@@ -20,11 +20,11 @@
import java.util.Map;
import java.util.Random;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.flow.apples.AppleController;
import org.apache.cocoon.components.flow.apples.AppleRequest;
import org.apache.cocoon.components.flow.apples.AppleResponse;
+import org.apache.cocoon.util.AbstractLogEnabled;
/**
* GuessGameApple shows an easy Apples implementation for a number guessing game.
@@ -43,7 +43,7 @@
String hint = "No hints yet.";
String targetURI = "guess/guess.jx";
- int newGuess = -1;
+ int newGuess;
String newGuessString = req.getCocoonRequest().getParameter("guess");
if (newGuessString != null) {
Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/HanoiApple.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/HanoiApple.java?rev=585341&r1=585340&r2=585341&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/HanoiApple.java (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/src/main/java/org/apache/cocoon/components/flow/apples/samples/HanoiApple.java Tue Oct 16 20:10:57 2007
@@ -20,11 +20,11 @@
import java.util.Map;
import java.util.Stack;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.flow.apples.AppleController;
import org.apache.cocoon.components.flow.apples.AppleRequest;
import org.apache.cocoon.components.flow.apples.AppleResponse;
+import org.apache.cocoon.util.AbstractLogEnabled;
/**
* HanoiApple shows an apple maintaining the state of the fanous puzzle.