jvanzyl 01/06/24 23:12:45
Modified: src/java/org/apache/turbine/services BaseService.java
BaseServiceBroker.java
BaseUnicastRemoteService.java Service.java
ServiceBroker.java
src/java/org/apache/turbine/services/intake/model
FileItemField.java
src/java/org/apache/turbine/services/intake/validator
FileValidator.java
Log:
- fixing mistakes made during my initial checkin, everything compiles
now. testing with the tdk now.
Revision Changes Path
1.15 +21 -18
jakarta-turbine/src/java/org/apache/turbine/services/BaseService.java
Index: BaseService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/BaseService.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BaseService.java 2001/06/25 05:40:21 1.14
+++ BaseService.java 2001/06/25 06:12:41 1.15
@@ -56,6 +56,9 @@
import java.util.Properties;
import java.util.List;
+
+import org.apache.turbine.util.TurbineException;
+
import org.apache.log4j.Category;
//!! this must go away we want to use a configuration
@@ -68,7 +71,9 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Kevin Burton</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: BaseService.java,v 1.14 2001/06/25 05:40:21 jvanzyl Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Leonard Richardson</a>
+ * @version $Id: BaseService.java,v 1.15 2001/06/25 06:12:41 jvanzyl Exp $
*/
public class BaseService implements Service
{
@@ -99,24 +104,8 @@
*/
protected String name;
- /**
- * Performs early initialization. Used in a manner similar to a ctor.
- *
- * BaseInitable doesn't need early initialization, therefore it
- * ignores all objects passed to it and performs no initialization
- * activities.
- *
- * @param data An Object to use for initialization activities.
- * @exception InitializationException Initialization of this
- * class was not successful.
- */
- public void init( Object data )
- throws InitializationException
- {
- }
-
/**
- * Performs late initializtion. Called when the Service is requested
+ * Performs late initializtion. Called when the service is requested
* for the first time (if not already completely initialized by the
* early initializer).
*
@@ -154,6 +143,15 @@
}
/**
+ * @see org.apache.turbine.services.Service#getStatus()
+ */
+ public String getStatus()
+ throws TurbineException
+ {
+ return (getInit() ? "Initialized" : "Uninitialized");
+ }
+
+ /**
* Returns initialization status.
*
* @return True if the service is initialized.
@@ -268,5 +266,10 @@
public Category getCategory()
{
return getServiceBroker().getCategory();
+ }
+
+ public Category getCategory(String name)
+ {
+ return getServiceBroker().getCategory(name);
}
}
1.38 +12 -1
jakarta-turbine/src/java/org/apache/turbine/services/BaseServiceBroker.java
Index: BaseServiceBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/BaseServiceBroker.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- BaseServiceBroker.java 2001/06/25 05:40:21 1.37
+++ BaseServiceBroker.java 2001/06/25 06:12:42 1.38
@@ -96,7 +96,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: BaseServiceBroker.java,v 1.37 2001/06/25 05:40:21 jvanzyl Exp $
+ * @version $Id: BaseServiceBroker.java,v 1.38 2001/06/25 06:12:42 jvanzyl Exp $
*/
public abstract class BaseServiceBroker implements ServiceBroker
{
@@ -213,6 +213,17 @@
public Category getCategory()
{
return category;
+ }
+
+ /**
+ * Get a log4j Category by name.
+ *
+ * @param name log4j category to return
+ * @return Category log4j category
+ */
+ public Category getCategory(String name)
+ {
+ return Category.getInstance(name);
}
/**
1.10 +5 -0
jakarta-turbine/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java
Index: BaseUnicastRemoteService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/BaseUnicastRemoteService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BaseUnicastRemoteService.java 2001/06/25 05:40:21 1.9
+++ BaseUnicastRemoteService.java 2001/06/25 06:12:42 1.10
@@ -145,4 +145,9 @@
{
return null;
}
+
+ public Category getCategory(String name)
+ {
+ return null;
+ }
}
1.16 +5 -24
jakarta-turbine/src/java/org/apache/turbine/services/Service.java
Index: Service.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/Service.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Service.java 2001/06/25 05:40:21 1.15
+++ Service.java 2001/06/25 06:12:42 1.16
@@ -68,7 +68,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Service.java,v 1.15 2001/06/25 05:40:21 jvanzyl Exp $
+ * @version $Id: Service.java,v 1.16 2001/06/25 06:12:42 jvanzyl Exp $
*/
public interface Service
{
@@ -78,28 +78,6 @@
public static final String SERVICE_NAME = "Service";
/**
- * Performs early initailization of an Initable
- *
- * During the startup of the system, different objects may be
- * passed to your class using this method. It should ignore any
- * objects that it doesn't need or understand.
- *
- * After the class changes its internal state so that getInit()
- * returns true, this method will be called no more, and late
- * initialization will not be performed.
- *
- * If your class relies on early initialization, and the object it
- * expects was not received, you can use late initialization to
- * throw an exception and complain.
- *
- * @param data An Object to use for initialization activities.
- * @exception InitializationException, if initilaization of this
- * class was not successful.
- */
- public void init( Object data )
- throws InitializationException;
-
- /**
* Performs late initialization of an Initable.
*
* When your class is being requested from an InitableBroker, it
@@ -109,7 +87,8 @@
* @exception InitializationException, if initialization of this
* class was not successful.
*/
- public void init( ) throws InitializationException;
+ public void init( )
+ throws InitializationException;
/**
* Returns an <code>Initable</code> to an uninitialized state.
@@ -172,4 +151,6 @@
public String getRealPath(String path);
public Category getCategory();
+
+ public Category getCategory(String name);
}
1.12 +2 -1
jakarta-turbine/src/java/org/apache/turbine/services/ServiceBroker.java
Index: ServiceBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/ServiceBroker.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ServiceBroker.java 2001/06/25 05:40:21 1.11
+++ ServiceBroker.java 2001/06/25 06:12:42 1.12
@@ -80,7 +80,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: ServiceBroker.java,v 1.11 2001/06/25 05:40:21 jvanzyl Exp $
+ * @version $Id: ServiceBroker.java,v 1.12 2001/06/25 06:12:42 jvanzyl Exp $
*/
public interface ServiceBroker
{
@@ -192,4 +192,5 @@
public String getRealPath(String path);
public String getApplicationRoot();
public Category getCategory();
+ public Category getCategory(String name);
}
1.2 +1 -1
jakarta-turbine/src/java/org/apache/turbine/services/intake/model/FileItemField.java
Index: FileItemField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/model/FileItemField.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileItemField.java 2001/06/24 18:06:27 1.1
+++ FileItemField.java 2001/06/25 06:12:44 1.2
@@ -65,7 +65,7 @@
// import org.apache.turbine.services.intake.validator.InitableByConstraintMap;
import org.apache.turbine.services.intake.validator.ValidationException;
import org.apache.turbine.services.intake.validator.Constraint;
-import org.apache.turbine.util.upload.FileItem;
+import org.apache.turbine.services.upload.FileItem;
/** */
1.2 +3 -3
jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/FileValidator.java
Index: FileValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/validator/FileValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileValidator.java 2001/06/24 18:06:28 1.1
+++ FileValidator.java 2001/06/25 06:12:44 1.2
@@ -57,7 +57,7 @@
import java.lang.reflect.Method;
import java.util.Map;
import org.apache.regexp.RE;
-import org.apache.turbine.om.Retrievable;
+import org.apache.turbine.services.db.om.Retrievable;
import org.apache.turbine.services.intake.TurbineIntake;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
@@ -66,7 +66,7 @@
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.upload.FileItem;
+import org.apache.turbine.services.upload.FileItem;
/**
* A validator that will compare a testValue against the following
@@ -82,7 +82,7 @@
* This validator can serve as the base class for more specific validators
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John McNally</a>
- * @version $Id: FileValidator.java,v 1.1 2001/06/24 18:06:28 jmcnally Exp $
+ * @version $Id: FileValidator.java,v 1.2 2001/06/25 06:12:44 jvanzyl Exp $
*/
public class FileValidator
implements Validator, InitableByConstraintMap
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
