henning 2002/12/23 14:52:27
Modified: src/java/org/apache/turbine/services/component
TurbineComponentService.java
src/java/org/apache/turbine/services/intake
TurbineIntakeService.java
src/java/org/apache/turbine/services/jsp
TurbineJspService.java
src/java/org/apache/turbine/services/schedule
TurbineNonPersistentSchedulerService.java
TurbineSchedulerService.java
src/java/org/apache/turbine/services/security
BaseSecurityService.java
src/java/org/apache/turbine/services/servlet
TurbineServletService.java
src/java/org/apache/turbine/services/uniqueid
TurbineUniqueIdService.java
src/java/org/apache/turbine/services/velocity
TurbineVelocityService.java
src/java/org/apache/turbine/services/xmlrpc
TurbineXmlRpcService.java
Log:
The new BaseService Broker no longer calls the "init(data)" method of
a service but just init() and relies on the service to fetch its
parameters from the Turbine class.
Added an init() method to the services where this was lacking and
deprecated the init(data) methods on all services.
Revision Changes Path
1.6 +2 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/component/TurbineComponentService.java
Index: TurbineComponentService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/component/TurbineComponentService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineComponentService.java 14 Aug 2002 16:44:09 -0000 1.5
+++ TurbineComponentService.java 23 Dec 2002 22:52:27 -0000 1.6
@@ -120,6 +120,7 @@
* @param config The ServletConfiguration from Turbine
*
* @throws InitializationException Something went wrong when starting up.
+ * @deprecated use init() instead.
*/
public void init(ServletConfig config)
throws InitializationException
1.6 +18 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/TurbineIntakeService.java
Index: TurbineIntakeService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/TurbineIntakeService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineIntakeService.java 11 Jul 2002 16:53:28 -0000 1.5
+++ TurbineIntakeService.java 23 Dec 2002 22:52:27 -0000 1.6
@@ -68,6 +68,7 @@
import java.util.Map;
import java.util.Properties;
import javax.servlet.ServletConfig;
+import org.apache.turbine.Turbine;
import org.apache.turbine.om.OMTool;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
@@ -130,9 +131,25 @@
}
/**
+ * Initializes the Intake Service.
+ * This is a zero parameter variant which queries the Turbine Servlet
+ * for its config.
+ *
+ * @throws InitializationException Something went wrong in the init
+ * stage
+ */
+ public void init()
+ throws InitializationException
+ {
+ ServletConfig conf = Turbine.getTurbineServletConfig();
+ init(conf);
+ }
+
+ /**
* Called the first time the Service is used.
*
* @param config A ServletConfig.
+ * @deprecated use init() instead.
*/
public void init(ServletConfig config)
throws InitializationException
1.6 +1 -0
jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
Index: TurbineJspService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/jsp/TurbineJspService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineJspService.java 14 Aug 2002 16:44:09 -0000 1.5
+++ TurbineJspService.java 23 Dec 2002 22:52:27 -0000 1.6
@@ -111,6 +111,7 @@
* @param config The ServletConfiguration from Turbine
*
* @throws InitializationException Something went wrong when starting up.
+ * @deprecated use init() instead.
*/
public void init(ServletConfig config) throws InitializationException
{
1.4 +18 -0
jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
Index: TurbineNonPersistentSchedulerService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineNonPersistentSchedulerService.java 11 Jul 2002 16:53:24 -0000 1.3
+++ TurbineNonPersistentSchedulerService.java 23 Dec 2002 22:52:27 -0000 1.4
@@ -58,6 +58,8 @@
import javax.servlet.ServletConfig;
import org.apache.torque.om.NumberKey;
import org.apache.torque.om.ObjectKey;
+import org.apache.turbine.Turbine;
+import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.resources.TurbineResources;
/**
@@ -107,6 +109,21 @@
}
/**
+ * Initializes the SchedulerService.
+ * This is a zero parameter variant which queries the Turbine Servlet
+ * for its config.
+ *
+ * @throws InitializationException Something went wrong in the init
+ * stage
+ */
+ public void init()
+ throws InitializationException
+ {
+ ServletConfig conf = Turbine.getTurbineServletConfig();
+ init(conf);
+ }
+
+ /**
* Called the first time the Service is used.<br>
*
* Load all the jobs from cold storage. Add jobs to the queue
@@ -114,6 +131,7 @@
* thread.
*
* @param config A ServletConfig.
+ * @deprecated use init() instead.
*/
public void init(ServletConfig config)
{
1.4 +18 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java
Index: TurbineSchedulerService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineSchedulerService.java 11 Jul 2002 16:53:24 -0000 1.3
+++ TurbineSchedulerService.java 23 Dec 2002 22:52:27 -0000 1.4
@@ -58,6 +58,7 @@
import java.util.Vector;
import javax.servlet.ServletConfig;
import org.apache.torque.util.Criteria;
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.resources.TurbineResources;
@@ -97,6 +98,21 @@
}
/**
+ * Initializes the SchedulerService.
+ * This is a zero parameter variant which queries the Turbine Servlet
+ * for its config.
+ *
+ * @throws InitializationException Something went wrong in the init
+ * stage
+ */
+ public void init()
+ throws InitializationException
+ {
+ ServletConfig conf = Turbine.getTurbineServletConfig();
+ init(conf);
+ }
+
+ /**
* Called the first time the Service is used.<br>
*
* Load all the jobs from cold storage. Add jobs to the queue
@@ -104,6 +120,7 @@
* thread.
*
* @param config A ServletConfig.
+ * @deprecated use init() instead.
*/
public void init(ServletConfig config)
throws InitializationException
1.6 +18 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/security/BaseSecurityService.java
Index: BaseSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/BaseSecurityService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaseSecurityService.java 21 Aug 2002 00:32:04 -0000 1.5
+++ BaseSecurityService.java 23 Dec 2002 22:52:27 -0000 1.6
@@ -60,6 +60,7 @@
import javax.mail.internet.MimeUtility;
import javax.servlet.ServletConfig;
import org.apache.torque.util.Criteria;
+import org.apache.turbine.Turbine;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
@@ -175,8 +176,24 @@
/**
* Initializes the SecurityService, locating the apropriate UserManager
+ * This is a zero parameter variant which queries the Turbine Servlet
+ * for its config.
+ *
+ * @throws InitializationException Something went wrong in the init
+ * stage
+ */
+ public void init()
+ throws InitializationException
+ {
+ ServletConfig conf = Turbine.getTurbineServletConfig();
+ init(conf);
+ }
+
+ /**
+ * Initializes the SecurityService, locating the apropriate UserManager
*
* @param config a ServletConfig, to enforce early initialization
+ * @deprecated use init() instead.
*/
public void init(ServletConfig config)
throws InitializationException
1.5 +2 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/servlet/TurbineServletService.java
Index: TurbineServletService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/servlet/TurbineServletService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineServletService.java 14 Aug 2002 16:44:09 -0000 1.4
+++ TurbineServletService.java 23 Dec 2002 22:52:27 -0000 1.5
@@ -106,6 +106,7 @@
* @param config A ServletConfig.
*
* @throws InitializationException Something went wrong when starting up.
+ * @deprecated use init() instead.
*/
public void init( ServletConfig servletConfig )
{
1.3 +19 -12
jakarta-turbine-2/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java
Index: TurbineUniqueIdService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineUniqueIdService.java 14 Aug 2002 16:59:24 -0000 1.2
+++ TurbineUniqueIdService.java 23 Dec 2002 22:52:27 -0000 1.3
@@ -54,6 +54,7 @@
* <http://www.apache.org/>.
*/
+import org.apache.turbine.Turbine;
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.GenerateUniqueId;
@@ -79,28 +80,34 @@
protected static int counter;
/**
+ * @deprecated Use init() instead
+ */
+ public void init(RunData data)
+ {
+ init();
+ }
+
+ /**
* <p> Initializes the service upon first Turbine.doGet()
* invocation.
- *
- * @param data A Turbine RunData object.
*/
- public void init( RunData data )
+ public void init()
{
StringBuffer url = new StringBuffer();
- url.append ( data.getServerScheme() );
+ url.append ( Turbine.getServerScheme() );
url.append ( "://" );
- url.append ( data.getServerName() );
- if ( (data.getServerScheme().equals("http") &&
- data.getServerPort() != 80) ||
- (data.getServerScheme().equals("https") &&
- data.getServerPort() != 443)
+ url.append ( Turbine.getServerName() );
+ if ( (Turbine.getServerScheme().equals("http") &&
+ Turbine.getServerPort() != "80") ||
+ (Turbine.getServerScheme().equals("https") &&
+ Turbine.getServerPort() != "443")
)
{
url.append (":");
- url.append ( data.getServerPort() );
+ url.append ( Turbine.getServerPort() );
}
- url.append ( data.getServerData().getScriptName() );
+ url.append ( Turbine.getScriptName() );
turbineURL = url.toString();
MD5 md5 = new MD5();
1.11 +2 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbineVelocityService.java 20 Dec 2002 00:17:24 -0000 1.10
+++ TurbineVelocityService.java 23 Dec 2002 22:52:27 -0000 1.11
@@ -181,6 +181,7 @@
* @param config The ServletConfiguration from Turbine
*
* @throws InitializationException Something went wrong when starting up.
+ * @deprecated use init() instead.
*/
public void init(ServletConfig config)
throws InitializationException
1.9 +19 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java
Index: TurbineXmlRpcService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TurbineXmlRpcService.java 11 Oct 2002 10:27:28 -0000 1.8
+++ TurbineXmlRpcService.java 23 Dec 2002 22:52:27 -0000 1.9
@@ -71,6 +71,7 @@
import java.util.Vector;
import javax.servlet.ServletConfig;
import org.apache.commons.configuration.Configuration;
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.xmlrpc.util.FileTransfer;
@@ -129,7 +130,24 @@
protected int port = 0;
/**
+ * This function initializes the XmlRpcService.This is
+ * a zero parameter variant which queries the Turbine Servlet
+ * for its config.
+ *
+ * @throws InitializationException Something went wrong in the init
+ * stage
+ */
+ public void init()
+ throws InitializationException
+ {
+ ServletConfig conf = Turbine.getTurbineServletConfig();
+ init(conf);
+ }
+
+ /**
* This function initializes the XmlRpcService.
+ *
+ * @deprecated Use init() instead.
*/
public void init(ServletConfig config) throws InitializationException
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
