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/12/28 14:59:19 UTC
svn commit: r359527 - in /cocoon:
blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/samples/
blocks/cron/trunk/java/org/apache/cocoon/components/cron/
blocks/faces/trunk/java/org/apache/cocoon/faces/samples/carstore/
blocks/faces/trunk/...
Author: cziegeler
Date: Wed Dec 28 05:59:01 2005
New Revision: 359527
URL: http://svn.apache.org/viewcvs?rev=359527&view=rev
Log:
Cleanup
Modified:
cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java
cocoon/blocks/cron/trunk/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/carstore/CarBean.java
cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/carstore/MessageFactory.java
cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/AreaComponent.java
cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/MapComponent.java
cocoon/trunk/src/java/org/apache/cocoon/util/JMXUtils.java
cocoon/trunk/src/java/org/apache/cocoon/util/location/LocatableException.java
cocoon/trunk/src/java/org/apache/cocoon/util/location/LocationAttributes.java
cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonStreamTargetFactory.java
cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonTargetFactory.java
Modified: cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java (original)
+++ cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java Wed Dec 28 05:59:01 2005
@@ -206,7 +206,6 @@
* Translate source path into target path so we keep a clean source XML
*
* @param path
- * @return
*/
private String makeTargetURI(String path) {
final String sfx = ".xml";
@@ -283,7 +282,6 @@
* Loads (and parses) the Document from the specified Source
*
* @param documentSrc
- * @return
* @throws ProcessingException
*/
private Document loadDocumentFromSource(Source documentSrc)
Modified: cocoon/blocks/cron/trunk/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/cron/trunk/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/blocks/cron/trunk/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java (original)
+++ cocoon/blocks/cron/trunk/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java Wed Dec 28 05:59:01 2005
@@ -71,22 +71,6 @@
Serviceable, Configurable, Startable,
Disposable, Contextualizable, Initializable {
- /** QuartzThreadPool policy RUN */
- private static final String POLICY_RUN = "RUN";
-
- /** QuartzThreadPool policy WAIT */
- private static final String POLICY_WAIT = "WAIT";
-
- /** QuartzThreadPool policy ABORT */
- private static final String POLICY_ABORT = "ABORT";
-
- /** QuartzThreadPool policy DISCARD */
- private static final String POLICY_DISCARD = "DISCARD";
-
- /** QuartzThreadPool policy DISCARD-OLDEST */
- private static final String POLICY_DISCARD_OLDEST = "DISCARDOLDEST";
-
-
/** Map key for the component role */
static final String DATA_MAP_ROLE = "QuartzJobScheduler.ROLE";
@@ -471,7 +455,7 @@
*/
public void stop()
throws Exception {
- scheduler.pause();
+ scheduler.standby();
}
/**
@@ -596,7 +580,6 @@
*/
private QuartzThreadPool createThreadPool(final Configuration poolConfig)
throws ServiceException {
- final boolean useQueueing = poolConfig.getChild("use-queueing").getValueAsBoolean(false);
final int queueSize = poolConfig.getChild("queue-size").getValueAsInteger(-1);
final int maxPoolSize = poolConfig.getChild("max-pool-size").getValueAsInteger(-1);
final int minPoolSize = poolConfig.getChild("min-pool-size").getValueAsInteger(-1);
Modified: cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/carstore/CarBean.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/carstore/CarBean.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/carstore/CarBean.java (original)
+++ cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/carstore/CarBean.java Wed Dec 28 05:59:01 2005
@@ -203,7 +203,6 @@
private void init(String bundleName) {
FacesContext context = FacesContext.getCurrentInstance();
ResourceBundle data = null;
- Enumeration keys = null;
components = new HashMap();
// load the labels
@@ -494,12 +493,9 @@
String valueType,
Converter converter) {
ArrayList optionsList = null;
- int i = 0;
- Object optionValue = null;
String
optionKey = null,
optionLabel = null;
- Map nonLocalizedOptionValues = null;
if (value == null) {
return null;
Modified: cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/carstore/MessageFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/carstore/MessageFactory.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/carstore/MessageFactory.java (original)
+++ cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/carstore/MessageFactory.java Wed Dec 28 05:59:01 2005
@@ -131,7 +131,6 @@
public static FacesMessage getMessage(Locale locale, String messageId,
Object params[]) {
- FacesMessage result = null;
String
summary = null,
detail = null,
Modified: cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/AreaComponent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/AreaComponent.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/AreaComponent.java (original)
+++ cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/AreaComponent.java Wed Dec 28 05:59:01 2005
@@ -198,8 +198,6 @@
*
* @param context <code>FacesContext</code> for the current request
* @param state State to be restored
- *
- * @throws IOException if an input/output error occurs
*/
public void restoreState(FacesContext context, Object state) {
Object values[] = (Object[]) state;
Modified: cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/MapComponent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/MapComponent.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/MapComponent.java (original)
+++ cocoon/blocks/faces/trunk/java/org/apache/cocoon/faces/samples/components/components/MapComponent.java Wed Dec 28 05:59:01 2005
@@ -214,8 +214,6 @@
*
* @param context <code>FacesContext</code> for the current request
* @param state State to be restored
- *
- * @throws IOException if an input/output error occurs
*/
public void restoreState(FacesContext context, Object state) {
removeDefaultActionListener(context);
Modified: cocoon/trunk/src/java/org/apache/cocoon/util/JMXUtils.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/util/JMXUtils.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/util/JMXUtils.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/util/JMXUtils.java Wed Dec 28 05:59:01 2005
@@ -214,8 +214,6 @@
* @param bean The bean to estabilsh JMX for
* @param info The component info
* @param logger The Logger
- *
- * @return
*/
public static ObjectInstance setupJmxFor(final Object bean,
final ComponentInfo info,
@@ -225,7 +223,6 @@
final String beanClassName = beanClass.getName();
final String mbeanClassName = beanClassName + "MBean";
ObjectName on = null;
- Object comp = null;
try {
// try to find a MBean for bean
Modified: cocoon/trunk/src/java/org/apache/cocoon/util/location/LocatableException.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/util/location/LocatableException.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/util/location/LocatableException.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/util/location/LocatableException.java Wed Dec 28 05:59:01 2005
@@ -25,8 +25,10 @@
* and location separately. This interface gives access to the raw message.
* <p>
* <strong>Note:</strong> care should be taken for locatable exceptions to use only immutable and
- * serializable implementations of {@link Location} ({@see org.apache.cocoon.util.location.LocationImpl#get(Location)}).
+ * serializable implementations of {@link Location}
*
+ * @see org.apache.cocoon.util.location.LocationImpl#get(Location)
+ *
* @since 2.1.8
* @version $Id$
*/
Modified: cocoon/trunk/src/java/org/apache/cocoon/util/location/LocationAttributes.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/util/location/LocationAttributes.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/util/location/LocationAttributes.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/util/location/LocationAttributes.java Wed Dec 28 05:59:01 2005
@@ -71,7 +71,6 @@
*
* @param locator the <code>Locator</code> (can be null)
* @param attrs the <code>Attributes</code> where locator information should be added
- * @return
*/
public static Attributes addLocationAttributes(Locator locator, Attributes attrs) {
if (locator == null || attrs.getIndex(URI, SRC_ATTR) != -1) {
@@ -108,7 +107,7 @@
/**
* Returns the location of an element (SAX flavor). If the location is to be kept
- * into an object built from this element, consider using {@link #getLocation(Attributes)}
+ * into an object built from this element, consider using {@link #getLocation(Attributes, String)}
* and the {@link Locatable} interface.
*
* @param attrs the element's attributes that hold the location information
@@ -162,7 +161,7 @@
/**
* Returns the {@link Location} of an element (DOM flavor).
*
- * @param attrs the element that holds the location information
+ * @param elem the element that holds the location information
* @param description a description for the location (if <code>null</code>, the element's name is used)
* @return a {@link Location} object
*/
Modified: cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java Wed Dec 28 05:59:01 2005
@@ -114,23 +114,12 @@
*/
private CallStack callStack;
- /**
- * The depth to which stacktraces are printed out
- */
- private final int m_stackDepth;
-
-
public CocoonLogFormatter() {
- this(DEFAULT_STACK_DEPTH);
- }
-
- public CocoonLogFormatter(int stackDepth) {
try {
this.callStack = new CallStack();
} catch (SecurityException e) {
// Ignore security exception
}
- this.m_stackDepth = stackDepth;
}
protected int getTypeIdFor(String type) {
Modified: cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonStreamTargetFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonStreamTargetFactory.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonStreamTargetFactory.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonStreamTargetFactory.java Wed Dec 28 05:59:01 2005
@@ -56,8 +56,7 @@
final String type = conf.getAttribute("type", "unknown");
if ("cocoon".equals(type)) {
- int depth = conf.getAttributeAsInteger( "depth", 0 );
- final CocoonLogFormatter formatter = new CocoonLogFormatter( depth );
+ final CocoonLogFormatter formatter = new CocoonLogFormatter();
final String format = conf.getValue(CFORMAT);
formatter.setFormat(format);
return formatter;
Modified: cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonTargetFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonTargetFactory.java?rev=359527&r1=359526&r2=359527&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonTargetFactory.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/util/log/CocoonTargetFactory.java Wed Dec 28 05:59:01 2005
@@ -105,8 +105,7 @@
final String type = conf.getAttribute("type", "unknown");
if ("cocoon".equals(type)) {
- int depth = conf.getAttributeAsInteger( "depth", 0 );
- final CocoonLogFormatter formatter = new CocoonLogFormatter( depth );
+ final CocoonLogFormatter formatter = new CocoonLogFormatter();
final String format = conf.getValue(CFORMAT);
formatter.setFormat(format);
return formatter;