You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by di...@apache.org on 2004/09/09 14:15:00 UTC
cvs commit: jakarta-commons/jelly/jelly-tags/log/src/test/org/apache/commons/jelly/tags/log TestJelly.java MockLog.java
dion 2004/09/09 05:15:00
Modified: jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log
InfoTag.java TraceTag.java WarnTag.java
ErrorTag.java DebugTag.java LogTagSupport.java
LogTagLibrary.java FatalTag.java
jelly/jelly-tags/ojb/src/java/org/apache/commons/jelly/tags/ojb
BrokerTag.java OjbTagLibrary.java StoreTag.java
jelly/jelly-tags/log/src/test/org/apache/commons/jelly/tags/log
TestJelly.java MockLog.java
Log:
Fix license file whitespace
Revision Changes Path
1.5 +6 -6 jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/InfoTag.java
Index: InfoTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/InfoTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InfoTag.java 25 Feb 2004 01:31:55 -0000 1.4
+++ InfoTag.java 9 Sep 2004 12:14:59 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -19,7 +19,7 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
-/**
+/**
* A tag which generates INFO level logging statement using
* the given category name.
*
@@ -32,7 +32,7 @@
}
// Tag interface
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isInfoEnabled() ) {
1.5 +6 -6 jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/TraceTag.java
Index: TraceTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/TraceTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TraceTag.java 25 Feb 2004 01:31:55 -0000 1.4
+++ TraceTag.java 9 Sep 2004 12:14:59 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -19,7 +19,7 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
-/**
+/**
* A tag which generates TRACE level logging statement using
* the given category name.
*
@@ -32,7 +32,7 @@
}
// Tag interface
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isTraceEnabled() ) {
1.5 +6 -6 jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/WarnTag.java
Index: WarnTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/WarnTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WarnTag.java 25 Feb 2004 01:31:55 -0000 1.4
+++ WarnTag.java 9 Sep 2004 12:14:59 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -19,7 +19,7 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
-/**
+/**
* A tag which generates WARN level logging statement using
* the given category name.
*
@@ -32,7 +32,7 @@
}
// Tag interface
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isWarnEnabled() ) {
1.5 +6 -6 jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/ErrorTag.java
Index: ErrorTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/ErrorTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ErrorTag.java 25 Feb 2004 01:31:55 -0000 1.4
+++ ErrorTag.java 9 Sep 2004 12:14:59 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -19,7 +19,7 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
-/**
+/**
* A tag which generates ERROR level logging statement using
* the given category name.
*
@@ -32,7 +32,7 @@
}
// Tag interface
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isErrorEnabled() ) {
1.5 +6 -6 jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/DebugTag.java
Index: DebugTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/DebugTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DebugTag.java 25 Feb 2004 01:31:55 -0000 1.4
+++ DebugTag.java 9 Sep 2004 12:14:59 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -19,7 +19,7 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
-/**
+/**
* A tag which generates DEBUG level logging statement using
* the given category name.
*
@@ -32,7 +32,7 @@
}
// Tag interface
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isDebugEnabled() ) {
1.5 +12 -12 jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/LogTagSupport.java
Index: LogTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/LogTagSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LogTagSupport.java 25 Feb 2004 01:31:55 -0000 1.4
+++ LogTagSupport.java 9 Sep 2004 12:14:59 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-/**
+/**
* An abstract base class for any logging tag..
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
@@ -30,13 +30,13 @@
private Log log;
private boolean encode;
-
+
public LogTagSupport() {
}
-
+
// Properties
- //-------------------------------------------------------------------------
-
+ //-------------------------------------------------------------------------
+
/**
* @return the Log being used by this tag. If none is returned then a new one will be created.
*/
@@ -48,19 +48,19 @@
}
return log;
}
-
+
/**
* Sets the name of the logger to use
*/
public void setName(String name) {
setLog( LogFactory.getLog(name) );
}
-
+
/** Sets the Log instance to use for logging. */
public void setLog(Log log) {
this.log = log;
}
-
+
/**
* Returns whether the body of this tag will be XML encoded or not.
*/
1.4 +5 -5 jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/LogTagLibrary.java
Index: LogTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/LogTagLibrary.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogTagLibrary.java 25 Feb 2004 01:31:55 -0000 1.3
+++ LogTagLibrary.java 9 Sep 2004 12:14:59 -0000 1.4
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -32,5 +32,5 @@
registerTag("error", ErrorTag.class);
registerTag("fatal", FatalTag.class);
}
-
+
}
1.5 +6 -6 jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/FatalTag.java
Index: FatalTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/log/src/java/org/apache/commons/jelly/tags/log/FatalTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FatalTag.java 25 Feb 2004 01:31:55 -0000 1.4
+++ FatalTag.java 9 Sep 2004 12:14:59 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -19,7 +19,7 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
-/**
+/**
* A tag which generates FATAL level logging statement using
* the given category name.
*
@@ -32,7 +32,7 @@
}
// Tag interface
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws JellyTagException {
Log log = getLog();
if ( log.isFatalEnabled() ) {
1.11 +19 -19 jakarta-commons/jelly/jelly-tags/ojb/src/java/org/apache/commons/jelly/tags/ojb/BrokerTag.java
Index: BrokerTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/ojb/src/java/org/apache/commons/jelly/tags/ojb/BrokerTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BrokerTag.java 25 Feb 2004 01:31:57 -0000 1.10
+++ BrokerTag.java 9 Sep 2004 12:14:59 -0000 1.11
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -24,62 +24,62 @@
/**
* <p>Tag handler for <Driver> in JSTL, used to create
* a simple DataSource for prototyping.</p>
- *
+ *
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version $Revision$
*/
public class BrokerTag extends TagSupport {
-
+
/** The variable name to export. */
private String var;
/** The persistence broker instance */
private PersistenceBroker broker;
-
+
public BrokerTag() {
}
// Tag interface
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws JellyTagException {
if ( var == null ) {
var = "org.apache.commons.jelly.ojb.Broker";
}
if ( broker != null ) {
- context.setVariable(var, broker);
- invokeBody(output);
+ context.setVariable(var, broker);
+ invokeBody(output);
}
else {
- broker = PersistenceBrokerFactory.defaultPersistenceBroker();
- context.setVariable(var, broker);
-
+ broker = PersistenceBrokerFactory.defaultPersistenceBroker();
+ context.setVariable(var, broker);
+
try {
- invokeBody(output);
+ invokeBody(output);
}
- finally {
+ finally {
broker.close();
broker = null;
- context.removeVariable(var);
+ context.removeVariable(var);
}
}
}
// Properties
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
/** Sets the variable name to define for this expression
*/
public void setVar(String var) {
this.var = var;
}
-
+
/** @return the persistence broker instance */
public PersistenceBroker getBroker() {
return broker;
}
-
+
/** Sets the persistence broker instance */
public void setBroker(PersistenceBroker broker) {
this.broker = broker;
- }
+ }
}
1.7 +3 -3 jakarta-commons/jelly/jelly-tags/ojb/src/java/org/apache/commons/jelly/tags/ojb/OjbTagLibrary.java
Index: OjbTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/ojb/src/java/org/apache/commons/jelly/tags/ojb/OjbTagLibrary.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OjbTagLibrary.java 25 Feb 2004 01:31:57 -0000 1.6
+++ OjbTagLibrary.java 9 Sep 2004 12:15:00 -0000 1.7
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
1.10 +15 -15 jakarta-commons/jelly/jelly-tags/ojb/src/java/org/apache/commons/jelly/tags/ojb/StoreTag.java
Index: StoreTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/ojb/src/java/org/apache/commons/jelly/tags/ojb/StoreTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StoreTag.java 25 Feb 2004 01:31:57 -0000 1.9
+++ StoreTag.java 9 Sep 2004 12:15:00 -0000 1.10
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -23,24 +23,24 @@
/**
* <p>This Store tag will store the given object in ObjectBridge using
* the given broker or it will use the parent broker tags broker instance.</p>
- *
+ *
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version $Revision$
*/
public class StoreTag extends TagSupport {
-
+
/** the value to persist */
private Object value;
-
+
/** The persistence broker instance */
private PersistenceBroker broker;
-
+
public StoreTag() {
}
// Tag interface
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws JellyTagException {
if ( value == null ) {
throw new JellyTagException( "No value is supplied!" );
@@ -49,13 +49,13 @@
}
// Properties
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
/** Sets the value to be persisted */
public void setValue(Object value) {
this.value = value;
- }
-
+ }
+
/** @return the persistence broker instance */
public PersistenceBroker getBroker() {
if (broker == null) {
@@ -64,17 +64,17 @@
broker = brokerTag.getBroker();
}
else {
- broker = (PersistenceBroker) context.getVariable(
- "org.apache.commons.jelly.ojb.Broker"
+ broker = (PersistenceBroker) context.getVariable(
+ "org.apache.commons.jelly.ojb.Broker"
);
}
}
return broker;
}
-
+
/** Sets the persistence broker instance */
public void setBroker(PersistenceBroker broker) {
this.broker = broker;
- }
+ }
}
1.4 +6 -6 jakarta-commons/jelly/jelly-tags/log/src/test/org/apache/commons/jelly/tags/log/TestJelly.java
Index: TestJelly.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/log/src/test/org/apache/commons/jelly/tags/log/TestJelly.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestJelly.java 25 Feb 2004 01:31:59 -0000 1.3
+++ TestJelly.java 9 Sep 2004 12:15:00 -0000 1.4
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -20,7 +20,7 @@
import org.apache.commons.jelly.tags.junit.JellyTestSuite;
-/**
+/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
@@ -31,8 +31,8 @@
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
}
-
+
public static TestSuite suite() throws Exception {
- return createTestSuite(TestJelly.class, "suite.jelly");
+ return createTestSuite(TestJelly.class, "suite.jelly");
}
}
1.4 +8 -8 jakarta-commons/jelly/jelly-tags/log/src/test/org/apache/commons/jelly/tags/log/MockLog.java
Index: MockLog.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/log/src/test/org/apache/commons/jelly/tags/log/MockLog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockLog.java 25 Feb 2004 01:31:59 -0000 1.3
+++ MockLog.java 9 Sep 2004 12:15:00 -0000 1.4
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed 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.
@@ -20,7 +20,7 @@
/**
* A Mock Object useful for unit testing of commons-logging. (Maybe this should
* be contributed back to commons-logging?)
- *
+ *
* @author James Strachan
* @version 1.1 2003/01/22 10:22:30
*/
@@ -33,7 +33,7 @@
private Object error;
private Object fatal;
private Throwable lastThrowable;
-
+
public MockLog() {
}
@@ -49,11 +49,11 @@
this.fatal = null;
this.lastThrowable = null;
}
-
-
+
+
// Log interface
//-------------------------------------------------------------------------
-
+
/**
* @see org.apache.commons.logging.Log#debug(java.lang.Object, java.lang.Throwable)
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org