dion 2003/01/06 03:54:45
Modified: src/java/org/apache/fulcrum/jsp TurbineJspService.java
JspService.java
src/java/org/apache/fulcrum/db TurbineDatabaseService.java
TurbineDB.java
src/java/org/apache/fulcrum ServiceBroker.java
BaseServiceBroker.java FulcrumContainer.java
HasApplicationRoot.java BaseService.java
ServiceManager.java
. .cvsignore
src/java/org/apache/fulcrum/mimetype
TurbineMimeTypeService.java
src/java/org/apache/fulcrum/intake/model
BigDecimalField.java BooleanField.java
StringField.java FloatField.java Field.java
Group.java DateStringField.java NumberKeyField.java
StringKeyField.java IntegerField.java
FileItemField.java ComboKeyField.java
src/java/org/apache/fulcrum/cache CachedObject.java
TurbineGlobalCache.java
src/java/org/apache/fulcrum/intake/validator
NumberKeyValidator.java NumberValidator.java
Validator.java
src/java/org/apache/fulcrum/dvsl FulcrumDvsl.java
src/java/org/apache/fulcrum/intake TurbineIntakeService.java
IntakeService.java Intake.java
src/java/org/apache/fulcrum/localization Localization.java
TurbineLocalizationService.java
src/java/org/apache/fulcrum/pool PoolService.java
TurbinePoolService.java
src/java/org/apache/fulcrum/bsf TurbineBSFService.java
src/java/org/apache/fulcrum/factory
TurbineFactoryService.java
src/java/org/apache/fulcrum/intake/transform
XmlToAppData.java
Log:
Some code cleanup I had lying around.
Note: I've been unable to compile with the latest cvs updates.
Revision Changes Path
1.3 +0 -6
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/jsp/TurbineJspService.java
Index: TurbineJspService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/jsp/TurbineJspService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineJspService.java 4 Nov 2002 05:36:48 -0000 1.2
+++ TurbineJspService.java 6 Jan 2003 11:54:43 -0000 1.3
@@ -54,16 +54,10 @@
* <http://www.apache.org/>.
*/
-import java.io.File;
-import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
import java.util.List;
import java.util.ArrayList;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
//import org.apache.turbine.RunData;
import org.apache.fulcrum.ServiceException;
//import org.apache.fulcrum.jsp.util.JspLink;
1.4 +0 -1
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/jsp/JspService.java
Index: JspService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/jsp/JspService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspService.java 4 Nov 2002 05:36:48 -0000 1.3
+++ JspService.java 6 Jan 2003 11:54:43 -0000 1.4
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.fulcrum.ServiceException;
import org.apache.avalon.framework.component.Component;
/**
1.4 +1 -4
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db/TurbineDatabaseService.java
Index: TurbineDatabaseService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db/TurbineDatabaseService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineDatabaseService.java 31 Jul 2002 20:37:00 -0000 1.3
+++ TurbineDatabaseService.java 6 Jan 2003 11:54:43 -0000 1.4
@@ -58,12 +58,9 @@
import org.apache.log4j.Category;
import org.apache.fulcrum.BaseService;
import org.apache.fulcrum.InitializationException;
-import org.apache.fulcrum.TurbineServices;
import org.apache.torque.Torque;
-import org.apache.torque.TorqueException;
import org.apache.torque.adapter.DB;
import org.apache.torque.map.DatabaseMap;
-import org.apache.torque.util.BasePeer;
/**
* Turbine's default implementation of {@link DatabaseService}.
1.3 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db/TurbineDB.java
Index: TurbineDB.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db/TurbineDB.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineDB.java 22 Jun 2002 16:54:05 -0000 1.2
+++ TurbineDB.java 6 Jan 2003 11:54:43 -0000 1.3
@@ -55,7 +55,6 @@
*/
import java.sql.Connection;
-import org.apache.fulcrum.ServiceException;
import org.apache.fulcrum.TurbineServices;
import org.apache.torque.adapter.DB;
import org.apache.torque.map.DatabaseMap;
1.3 +1 -4
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/ServiceBroker.java
Index: ServiceBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/ServiceBroker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServiceBroker.java 4 Nov 2002 05:36:47 -0000 1.2
+++ ServiceBroker.java 6 Jan 2003 11:54:43 -0000 1.3
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.List;
-import java.util.Hashtable;
-
import org.apache.commons.configuration.Configuration;
import org.apache.log4j.Category;
1.9 +1 -5
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/BaseServiceBroker.java
Index: BaseServiceBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/BaseServiceBroker.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BaseServiceBroker.java 21 Nov 2002 19:55:52 -0000 1.8
+++ BaseServiceBroker.java 6 Jan 2003 11:54:43 -0000 1.9
@@ -58,14 +58,10 @@
import java.io.File;
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.Date;
import java.util.Enumeration;
import java.util.Map;
import java.util.Hashtable;
import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Stack;
import java.lang.reflect.Field;
import org.apache.fulcrum.ServiceException;
1.2 +0 -1
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/FulcrumContainer.java
Index: FulcrumContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/FulcrumContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FulcrumContainer.java 4 Nov 2002 05:36:47 -0000 1.1
+++ FulcrumContainer.java 6 Jan 2003 11:54:43 -0000 1.2
@@ -73,7 +73,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.log.Hierarchy;
public class FulcrumContainer
1.2 +1 -3
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/HasApplicationRoot.java
Index: HasApplicationRoot.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/HasApplicationRoot.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HasApplicationRoot.java 4 Nov 2002 05:36:47 -0000 1.1
+++ HasApplicationRoot.java 6 Jan 2003 11:54:43 -0000 1.2
@@ -56,8 +56,6 @@
import java.io.File;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
1.2 +1 -3
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/BaseService.java
Index: BaseService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/BaseService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseService.java 30 May 2002 02:27:08 -0000 1.1
+++ BaseService.java 6 Jan 2003 11:54:43 -0000 1.2
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.List;
-
import org.apache.commons.configuration.Configuration;
import org.apache.log4j.Category;
1.2 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/ServiceManager.java
Index: ServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/ServiceManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServiceManager.java 30 May 2002 02:27:10 -0000 1.1
+++ ServiceManager.java 6 Jan 2003 11:54:43 -0000 1.2
@@ -55,7 +55,6 @@
*/
import org.apache.commons.configuration.Configuration;
-import org.apache.log4j.Category;
/**
* Classes that implement this interface can act as a manager for
1.5 +2 -0 jakarta-turbine-fulcrum/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 8 Jul 2002 23:17:51 -0000 1.4
+++ .cvsignore 6 Jan 2003 11:54:43 -0000 1.5
@@ -2,3 +2,5 @@
velocity.log
maven.log
*~
+.classpath
+.project
1.3 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/mimetype/TurbineMimeTypeService.java
Index: TurbineMimeTypeService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/mimetype/TurbineMimeTypeService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineMimeTypeService.java 4 Nov 2002 05:36:49 -0000 1.2
+++ TurbineMimeTypeService.java 6 Jan 2003 11:54:43 -0000 1.3
@@ -58,7 +58,6 @@
import java.io.IOException;
import java.util.Locale;
-import org.apache.fulcrum.BaseService;
import org.apache.fulcrum.InitializationException;
import org.apache.fulcrum.mimetype.util.MimeType;
import org.apache.fulcrum.mimetype.util.MimeTypeMap;
1.3 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/BigDecimalField.java
Index: BigDecimalField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/BigDecimalField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BigDecimalField.java 1 Aug 2002 17:04:11 -0000 1.2
+++ BigDecimalField.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -57,7 +57,6 @@
import java.math.BigDecimal;
import java.text.DecimalFormatSymbols;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
-import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.log4j.Category;
/**
1.3 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/BooleanField.java
Index: BooleanField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/BooleanField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BooleanField.java 1 Aug 2002 17:04:11 -0000 1.2
+++ BooleanField.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -55,7 +55,6 @@
*/
import org.apache.fulcrum.intake.xmlmodel.XmlField;
-import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.log4j.Category;
/**
1.3 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/StringField.java
Index: StringField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/StringField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringField.java 1 Aug 2002 17:04:11 -0000 1.2
+++ StringField.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
/**
1.3 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/FloatField.java
Index: FloatField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/FloatField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FloatField.java 1 Aug 2002 17:04:11 -0000 1.2
+++ FloatField.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.fulcrum.intake.xmlmodel.Rule;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
import org.apache.log4j.Category;
1.3 +1 -4
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/Field.java
Index: Field.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/Field.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Field.java 1 Aug 2002 17:04:11 -0000 1.2
+++ Field.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -55,10 +55,8 @@
*/
import java.util.Locale;
-import java.util.Map;
import java.lang.reflect.Method;
-import org.apache.regexp.RE;
import org.apache.fulcrum.ServiceException;
import org.apache.fulcrum.TurbineServices;
import org.apache.fulcrum.localization.Localization;
@@ -67,7 +65,6 @@
import org.apache.fulcrum.intake.TurbineIntake;
import org.apache.fulcrum.intake.xmlmodel.Rule;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
-import org.apache.fulcrum.intake.xmlmodel.XmlGroup;
import org.apache.fulcrum.intake.validator.Validator;
import org.apache.fulcrum.intake.validator.InitableByConstraintMap;
import org.apache.fulcrum.intake.validator.ValidationException;
1.2 +0 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/Group.java
Index: Group.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/Group.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Group.java 30 May 2002 02:27:19 -0000 1.1
+++ Group.java 6 Jan 2003 11:54:44 -0000 1.2
@@ -59,7 +59,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.commons.pool.BaseKeyedPoolableObjectFactory;
import org.apache.fulcrum.intake.Retrievable;
import org.apache.fulcrum.intake.TurbineIntake;
@@ -68,7 +67,6 @@
import org.apache.fulcrum.intake.xmlmodel.XmlGroup;
import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.fulcrum.ServiceException;
-import org.apache.fulcrum.pool.Recyclable;
import org.apache.log4j.Category;
/** Holds a group of Fields */
1.3 +1 -3
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/DateStringField.java
Index: DateStringField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/DateStringField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DateStringField.java 1 Aug 2002 17:04:11 -0000 1.2
+++ DateStringField.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -58,9 +58,7 @@
import java.text.DateFormat;
import java.text.ParseException;
import org.apache.fulcrum.intake.validator.DateStringValidator;
-import org.apache.fulcrum.intake.xmlmodel.Rule;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
-import org.apache.fulcrum.util.parser.ValueParser;
/**
* Field for date inputs as free form text. The parsing of date strings
1.3 +1 -4
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/NumberKeyField.java
Index: NumberKeyField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/NumberKeyField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NumberKeyField.java 1 Aug 2002 17:04:11 -0000 1.2
+++ NumberKeyField.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -56,10 +56,7 @@
import java.math.BigDecimal;
import org.apache.torque.om.NumberKey;
-import org.apache.torque.om.ObjectKey;
-import org.apache.fulcrum.intake.xmlmodel.Rule;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
-import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.log4j.Category;
/**
1.3 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/StringKeyField.java
Index: StringKeyField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/StringKeyField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringKeyField.java 1 Aug 2002 17:04:11 -0000 1.2
+++ StringKeyField.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -56,7 +56,6 @@
import org.apache.torque.om.StringKey;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
-import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.log4j.Category;
/**
1.3 +1 -3
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/IntegerField.java
Index: IntegerField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/IntegerField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IntegerField.java 1 Aug 2002 17:04:11 -0000 1.2
+++ IntegerField.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -54,9 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.fulcrum.intake.xmlmodel.Rule;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
-import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.log4j.Category;
/**
1.3 +1 -5
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/FileItemField.java
Index: FileItemField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/FileItemField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileItemField.java 1 Aug 2002 17:04:11 -0000 1.2
+++ FileItemField.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -54,16 +54,12 @@
* <http://www.apache.org/>.
*/
-import java.util.Vector;
-import org.apache.fulcrum.intake.xmlmodel.Rule;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.fulcrum.util.parser.ParameterParser;
-import org.apache.fulcrum.intake.validator.Validator;
import org.apache.fulcrum.intake.validator.FileValidator;
// import org.apache.fulcrum.intake.validator.InitableByConstraintMap;
import org.apache.fulcrum.intake.validator.ValidationException;
-import org.apache.fulcrum.intake.validator.Constraint;
import org.apache.fulcrum.ServiceException;
import org.apache.commons.fileupload.FileItem;
1.3 +1 -5
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/ComboKeyField.java
Index: ComboKeyField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/model/ComboKeyField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComboKeyField.java 1 Aug 2002 17:04:11 -0000 1.2
+++ ComboKeyField.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -54,11 +54,7 @@
* <http://www.apache.org/>.
*/
-import java.util.Vector;
-import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.torque.om.ComboKey;
-import org.apache.torque.om.ObjectKey;
-import org.apache.fulcrum.intake.xmlmodel.Rule;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
//import org.apache.fulcrum.ServiceException;
import org.apache.log4j.Category;
1.2 +2 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/cache/CachedObject.java
Index: CachedObject.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/cache/CachedObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CachedObject.java 30 May 2002 02:27:11 -0000 1.1
+++ CachedObject.java 6 Jan 2003 11:54:44 -0000 1.2
@@ -65,7 +65,7 @@
* @version $Id$
*/
public class CachedObject
- implements java.io.Serializable
+ implements Serializable
{
/** Cache the object with the Default TTL */
1.2 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/cache/TurbineGlobalCache.java
Index: TurbineGlobalCache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/cache/TurbineGlobalCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineGlobalCache.java 30 May 2002 02:27:11 -0000 1.1
+++ TurbineGlobalCache.java 6 Jan 2003 11:54:44 -0000 1.2
@@ -55,7 +55,6 @@
*/
import java.io.IOException;
-import org.apache.fulcrum.Service;
import org.apache.fulcrum.TurbineServices;
/**
1.3 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/validator/NumberKeyValidator.java
Index: NumberKeyValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/validator/NumberKeyValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NumberKeyValidator.java 1 Aug 2002 17:02:30 -0000 1.2
+++ NumberKeyValidator.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.math.BigDecimal;
import java.util.Map;
import org.apache.torque.om.NumberKey;
import org.apache.fulcrum.ServiceException;
1.3 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/validator/NumberValidator.java
Index: NumberValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/validator/NumberValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NumberValidator.java 1 Aug 2002 17:02:30 -0000 1.2
+++ NumberValidator.java 6 Jan 2003 11:54:44 -0000 1.3
@@ -56,7 +56,6 @@
import java.math.BigDecimal;
import java.util.Map;
-import org.apache.torque.om.NumberKey;
import org.apache.fulcrum.ServiceException;
/**
1.2 +1 -4
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/validator/Validator.java
Index: Validator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/validator/Validator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Validator.java 30 May 2002 02:27:21 -0000 1.1
+++ Validator.java 6 Jan 2003 11:54:44 -0000 1.2
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Map;
-import org.apache.fulcrum.ServiceException;
-
/**
* Validator api.
*
1.2 +0 -1
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/dvsl/FulcrumDvsl.java
Index: FulcrumDvsl.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/dvsl/FulcrumDvsl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FulcrumDvsl.java 30 May 2002 02:27:16 -0000 1.1
+++ FulcrumDvsl.java 6 Jan 2003 11:54:44 -0000 1.2
@@ -59,7 +59,6 @@
import java.util.Properties;
-import org.apache.fulcrum.Service;
import org.apache.fulcrum.TurbineServices;
/**
1.3 +1 -8
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/TurbineIntakeService.java
Index: TurbineIntakeService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/TurbineIntakeService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineIntakeService.java 4 Nov 2002 05:36:48 -0000 1.2
+++ TurbineIntakeService.java 6 Jan 2003 11:54:45 -0000 1.3
@@ -60,10 +60,6 @@
import java.io.ObjectOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
-import java.beans.BeanInfo;
-import java.beans.FeatureDescriptor;
-import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -77,11 +73,8 @@
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.intake.transform.XmlToAppData;
import org.apache.fulcrum.intake.xmlmodel.AppData;
-import org.apache.fulcrum.intake.xmlmodel.XmlField;
import org.apache.fulcrum.intake.xmlmodel.XmlGroup;
import org.apache.fulcrum.ServiceException;
-import org.apache.fulcrum.pool.BoundedBuffer;
-import org.apache.fulcrum.pool.Recyclable;
import org.apache.fulcrum.HasApplicationRoot;
import org.apache.fulcrum.InitializationException;
1.3 +1 -3
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/IntakeService.java
Index: IntakeService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/IntakeService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IntakeService.java 4 Nov 2002 05:36:48 -0000 1.2
+++ IntakeService.java 6 Jan 2003 11:54:45 -0000 1.3
@@ -57,8 +57,6 @@
import java.lang.reflect.Method;
import org.apache.avalon.framework.component.Component;
import org.apache.fulcrum.ServiceException;
-import org.apache.fulcrum.pool.Recyclable;
-import org.apache.fulcrum.util.parser.ValueParser;
import org.apache.fulcrum.intake.model.Group;
/**
1.2 +1 -3
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/Intake.java
Index: Intake.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/Intake.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Intake.java 30 May 2002 02:27:17 -0000 1.1
+++ Intake.java 6 Jan 2003 11:54:45 -0000 1.2
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
1.2 +1 -3
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/localization/Localization.java
Index: Localization.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/localization/Localization.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Localization.java 30 May 2002 02:27:23 -0000 1.1
+++ Localization.java 6 Jan 2003 11:54:45 -0000 1.2
@@ -57,8 +57,6 @@
import javax.servlet.http.HttpServletRequest;
import java.util.Locale;
import java.util.ResourceBundle;
-import org.apache.fulcrum.Service;
-import org.apache.fulcrum.ServiceBroker;
import org.apache.fulcrum.TurbineServices;
/**
1.5 +1 -5
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/localization/TurbineLocalizationService.java
Index: TurbineLocalizationService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/localization/TurbineLocalizationService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineLocalizationService.java 4 Nov 2002 05:36:48 -0000 1.4
+++ TurbineLocalizationService.java 6 Jan 2003 11:54:45 -0000 1.5
@@ -55,23 +55,19 @@
*/
import java.text.MessageFormat;
-import java.text.FieldPosition;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Category;
-import org.apache.fulcrum.BaseService;
import org.apache.fulcrum.InitializationException;
import org.apache.fulcrum.BaseFulcrumComponent;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
1.3 +1 -4
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/pool/PoolService.java
Index: PoolService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/pool/PoolService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PoolService.java 4 Nov 2002 05:36:49 -0000 1.2
+++ PoolService.java 6 Jan 2003 11:54:45 -0000 1.3
@@ -56,9 +56,6 @@
import org.apache.fulcrum.ServiceException;
import org.apache.fulcrum.factory.FactoryService;
-import org.apache.avalon.framework.component.Component;
-
-
/**
* The Pool Service extends the Factory Service by adding support
1.3 +1 -5
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/pool/TurbinePoolService.java
Index: TurbinePoolService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/pool/TurbinePoolService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbinePoolService.java 4 Nov 2002 05:36:49 -0000 1.2
+++ TurbinePoolService.java 6 Jan 2003 11:54:45 -0000 1.3
@@ -65,13 +65,9 @@
import org.apache.fulcrum.factory.TurbineFactoryService;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Component;
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.avalon.framework.thread.ThreadSafe;
//import org.apache.avalon.framework.;
1.3 +1 -2
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/bsf/TurbineBSFService.java
Index: TurbineBSFService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/bsf/TurbineBSFService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineBSFService.java 4 Nov 2002 05:36:48 -0000 1.2
+++ TurbineBSFService.java 6 Jan 2003 11:54:45 -0000 1.3
@@ -61,7 +61,6 @@
import java.io.StringWriter;
import com.ibm.bsf.BSFManager;
import com.ibm.bsf.BSFException;
-import org.apache.fulcrum.InitializationException;
import org.apache.fulcrum.HasApplicationRoot;
import org.apache.avalon.framework.activity.Initializable;
@@ -132,7 +131,7 @@
try
{
- manager.exec(manager.getLangFromFilename(script),
+ manager.exec(BSFManager.getLangFromFilename(script),
script, 0, 0, fileContentsToString(script));
}
catch (IOException ioe)
1.3 +1 -4
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/factory/TurbineFactoryService.java
Index: TurbineFactoryService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/factory/TurbineFactoryService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineFactoryService.java 4 Nov 2002 05:36:48 -0000 1.2
+++ TurbineFactoryService.java 6 Jan 2003 11:54:45 -0000 1.3
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Vector;
@@ -67,13 +66,11 @@
import org.apache.fulcrum.InitializationException;
import org.apache.fulcrum.BaseFulcrumComponent;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
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.avalon.framework.thread.ThreadSafe;
//import org.apache.avalon.framework.;
1.2 +1 -6
jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/transform/XmlToAppData.java
Index: XmlToAppData.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/intake/transform/XmlToAppData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XmlToAppData.java 30 May 2002 02:27:20 -0000 1.1
+++ XmlToAppData.java 6 Jan 2003 11:54:45 -0000 1.2
@@ -56,18 +56,13 @@
import java.io.BufferedReader;
import java.io.FileReader;
-import java.io.Reader;
import org.apache.fulcrum.intake.xmlmodel.AppData;
import org.apache.fulcrum.intake.xmlmodel.Rule;
import org.apache.fulcrum.intake.xmlmodel.XmlField;
import org.apache.fulcrum.intake.xmlmodel.XmlGroup;
import org.apache.xerces.parsers.SAXParser;
import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
