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 2005/02/23 21:10:29 UTC
svn commit: r155061 - in cocoon/trunk/src:
blocks/databases/java/org/apache/cocoon/acting/
blocks/scratchpad/java/org/apache/cocoon/acting/
blocks/scratchpad/java/org/apache/cocoon/ant/
blocks/scratchpad/java/org/apache/cocoon/components/flow/ws/
java/org/apache/cocoon/environment/
Author: cziegeler
Date: Wed Feb 23 12:10:26 2005
New Revision: 155061
URL: http://svn.apache.org/viewcvs?view=rev&rev=155061
Log:
Remove some uses of xsp in scratchpad
Modified:
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/DelayedFileOutputStream.java
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/ws/EndpointDefinition.java
cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java
Modified: cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java?view=diff&r1=155060&r2=155061
==============================================================================
--- cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java (original)
+++ cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java Wed Feb 23 12:10:26 2005
@@ -349,5 +349,5 @@
getLogger().error("Exception: ", e);
}
return null;
- }
+ }
}
Modified: cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java?view=diff&r1=155060&r2=155061
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java (original)
+++ cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java Wed Feb 23 12:10:26 2005
@@ -41,7 +41,7 @@
* variable in the Map.
*
* @author <a href="mailto:sergio.carvalho@acm.org">Sergio Carvalho</a>
- * @version CVS $Id: SectionCutterAction.java,v 1.3 2004/03/05 10:07:25 bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class SectionCutterAction extends ConfigurableServiceableAction implements ThreadSafe {
@@ -126,7 +126,7 @@
* @author subzero
* @version
*/
- class Section extends Object {
+ static class Section extends Object {
String matchExpression;
Dictionary mapVars = new Hashtable();
Modified: cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java?view=diff&r1=155060&r2=155061
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java (original)
+++ cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java Wed Feb 23 12:10:26 2005
@@ -45,6 +45,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.commandline.CommandLineContext;
import org.apache.cocoon.util.IOUtils;
+import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.SystemUtils;
import org.apache.log.Hierarchy;
@@ -192,7 +193,7 @@
* @param preCompileOnly The new precompileOnly value
*/
public void setPrecompileOnly(boolean preCompileOnly) {
- //this.preCompileOnly = new Boolean(preCompileOnly);
+ //this.preCompileOnly = BooleanUtils.toBooleanObject(preCompileOnly);
}
@@ -202,7 +203,7 @@
* @param followLinks The new followLinks value
*/
public void setFollowLinks(boolean followLinks) {
- this.followLinks = new Boolean(followLinks);
+ this.followLinks = BooleanUtils.toBooleanObject(followLinks);
}
Modified: cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/DelayedFileOutputStream.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/DelayedFileOutputStream.java?view=diff&r1=155060&r2=155061
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/DelayedFileOutputStream.java (original)
+++ cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/ant/DelayedFileOutputStream.java Wed Feb 23 12:10:26 2005
@@ -28,7 +28,7 @@
* A output stream writing to a ByteArrayOutputStream, until FilOutputStream target is defined.
*
* @author huber@apache.org
- * @version CVS $Id: DelayedFileOutputStream.java,v 1.2 2004/03/05 10:07:25 bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class DelayedFileOutputStream extends OutputStream {
/**
@@ -182,9 +182,7 @@
baos.close();
}
} catch (IOException ioe) {
- if (ioexception == null) {
- ioexception = ioe;
- }
+ ioexception = ioe;
} finally {
baos = null;
}
@@ -227,9 +225,7 @@
baos.flush();
}
} catch (IOException ioe) {
- if (ioexception == null) {
- ioexception = ioe;
- }
+ ioexception = ioe;
}
// flush fos
Modified: cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/ws/EndpointDefinition.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/ws/EndpointDefinition.java?view=diff&r1=155060&r2=155061
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/ws/EndpointDefinition.java (original)
+++ cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/ws/EndpointDefinition.java Wed Feb 23 12:10:26 2005
@@ -60,7 +60,7 @@
* Returns the target namespace of the WSDL document in which this endpoint
* is defined.
*
- * @return
+ * @return String
*/
public String getNamespaceURI() {
return namespaceURI;
@@ -69,7 +69,7 @@
/**
* Returns the name of the service that this endpoint belongs to.
*
- * @return
+ * @return String
*/
public String getServiceName() {
return service.getQName().getLocalPart();
@@ -78,7 +78,7 @@
/**
* Returns the name of the port that concretely defines the endpoint.
*
- * @return
+ * @return String
*/
public String getPortName() {
return port.getName();
@@ -224,4 +224,4 @@
}
return false;
}
-}
\ No newline at end of file
+}
Modified: cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java?view=diff&r1=155060&r2=155061
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/environment/ObjectModelHelper.java Wed Feb 23 12:10:26 2005
@@ -93,6 +93,7 @@
* @param cookieName Name of the cookie which is to be found and returned back
* @param cookieIndex Index of the cookie which is to be found and returned
* @return cookie object is returned
+ * @since 2.1.7
*/
public static Cookie getCookie(Map objectModel,
String cookieName,