cziegeler 2003/03/06 05:18:40
Modified: src/blocks/velocity/java/org/apache/cocoon/generation
FlowVelocityGenerator.java JSIntrospector.java
src/blocks/slide/java/org/apache/cocoon/components/source/impl
SlideSourceFactory.java
src/blocks/slide/java/org/apache/cocoon/components/repository/impl
SlidePrincipalProvider.java
Log:
Code cleaning
Revision Changes Path
1.3 +13 -18
xml-cocoon2/src/blocks/velocity/java/org/apache/cocoon/generation/FlowVelocityGenerator.java
Index: FlowVelocityGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/velocity/java/org/apache/cocoon/generation/FlowVelocityGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FlowVelocityGenerator.java 3 Mar 2003 06:55:29 -0000 1.2
+++ FlowVelocityGenerator.java 6 Mar 2003 13:18:40 -0000 1.3
@@ -50,6 +50,13 @@
*/
package org.apache.cocoon.generation;
+import java.beans.PropertyDescriptor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.*;
+
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
@@ -61,34 +68,22 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.components.flow.WebContinuation;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.commons.collections.ExtendedProperties;
+import org.apache.commons.jxpath.DynamicPropertyHandler;
+import org.apache.commons.jxpath.JXPathBeanInfo;
+import org.apache.commons.jxpath.JXPathIntrospector;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.xml.sax.SAXParser;
-import org.apache.velocity.context.Context;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.log.LogSystem;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-import java.beans.PropertyDescriptor;
-import org.apache.commons.jxpath.*;
/**
* <p>Cocoon [EMAIL PROTECTED] Generator} that produces dynamic XML SAX events
1.2 +6 -6
xml-cocoon2/src/blocks/velocity/java/org/apache/cocoon/generation/JSIntrospector.java
Index: JSIntrospector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/velocity/java/org/apache/cocoon/generation/JSIntrospector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JSIntrospector.java 2 Mar 2003 23:40:11 -0000 1.1
+++ JSIntrospector.java 6 Mar 2003 13:18:40 -0000 1.2
@@ -103,7 +103,7 @@
} catch (JavaScriptException e) {
throw new java.lang.reflect.InvocationTargetException(e);
} finally {
- cx.exit();
+ Context.exit();
}
}
@@ -149,7 +149,7 @@
}
return result;
} finally {
- cx.exit();
+ Context.exit();
}
}
@@ -193,7 +193,7 @@
ScriptableObject.putProperty(thisObj, name, arg);
return rhs;
} finally {
- cx.exit();
+ Context.exit();
}
}
@@ -232,7 +232,7 @@
}
return result;
} finally {
- cx.exit();
+ Context.exit();
}
}
@@ -271,7 +271,7 @@
}
return result;
} finally {
- cx.exit();
+ Context.exit();
}
}
@@ -280,7 +280,7 @@
try {
scope.delete(ids[index].toString());
} finally {
- cx.exit();
+ Context.exit();
}
}
}
1.4 +1 -6
xml-cocoon2/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSourceFactory.java
Index: SlideSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSourceFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SlideSourceFactory.java 5 Mar 2003 18:47:59 -0000 1.3
+++ SlideSourceFactory.java 6 Mar 2003 13:18:40 -0000 1.4
@@ -55,27 +55,22 @@
import java.net.MalformedURLException;
import java.util.Map;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.components.repository.Repository;
import org.apache.cocoon.components.repository.impl.SlideRepository;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.components.source.helpers.SourceCredential;
-
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceFactory;
import org.apache.excalibur.source.SourceParameters;
-
import org.apache.slide.common.NamespaceAccessToken;
/**
1.4 +1 -5
xml-cocoon2/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlidePrincipalProvider.java
Index: SlidePrincipalProvider.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlidePrincipalProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SlidePrincipalProvider.java 5 Mar 2003 18:47:59 -0000 1.3
+++ SlidePrincipalProvider.java 6 Mar 2003 13:18:40 -0000 1.4
@@ -56,22 +56,18 @@
import java.util.Vector;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.Composable;
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.logger.AbstractLogEnabled;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.repository.Principal;
import org.apache.cocoon.components.repository.PrincipalGroup;
import org.apache.cocoon.components.repository.PrincipalProvider;
import org.apache.cocoon.components.repository.Repository;
-
import org.apache.slide.authenticate.CredentialsToken;
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.NamespaceConfig;
