jvanzyl 01/06/14 07:44:41
Modified: src/java/org/apache/turbine/services/uniqueid
TurbineUniqueIdService.java
Log:
- updating service as per notes.
Revision Changes Path
1.10 +29 -19
jakarta-turbine/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java
Index: TurbineUniqueIdService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineUniqueIdService.java 2001/05/05 14:03:44 1.9
+++ TurbineUniqueIdService.java 2001/06/14 14:44:41 1.10
@@ -54,10 +54,10 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.util.Log;
-import org.apache.turbine.util.RunData;
import org.apache.turbine.util.GenerateUniqueId;
-import org.apache.turbine.services.TurbineBaseService;
+import org.apache.turbine.services.BaseService;
+import org.apache.turbine.services.InitializationException;
+import org.apache.turbine.services.servlet.TurbineServlet;
import org.apache.java.security.MD5;
import org.apache.java.lang.Bytes;
@@ -65,10 +65,17 @@
* <p> This is an implementation of {@link UniqueIdService}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: TurbineUniqueIdService.java,v 1.9 2001/05/05 14:03:44 jvanzyl Exp $
+ * @version $Id: TurbineUniqueIdService.java,v 1.10 2001/06/14 14:44:41 jvanzyl Exp
$
+ *
+ * NOTE:
+ *
+ * Does this services absolutely need RunData? Can we make
+ * this service portable. Maybe this is specifically for webapp
+ * use, but it would still be nice if it didn't require RunData
+ * so that other webapp frameworks could use it. jvz.
*/
public class TurbineUniqueIdService
- extends TurbineBaseService
+ extends BaseService
implements UniqueIdService
{
/** The identifier of this instance of turbine. */
@@ -81,33 +88,35 @@
/**
* <p> Initializes the service upon first Turbine.doGet()
* invocation.
- *
- * @param data A Turbine RunData object.
*/
- public void init( RunData data )
+ public void init() throws InitializationException
{
StringBuffer url = new StringBuffer();
- url.append ( data.getServerScheme() );
+ url.append ( TurbineServlet.getServerScheme() );
url.append ( "://" );
- url.append ( data.getServerName() );
- if ( (data.getServerScheme().equals("http") &&
- data.getServerPort() != 80) ||
- (data.getServerScheme().equals("https") &&
- data.getServerPort() != 443)
+ url.append ( TurbineServlet.getServerName() );
+
+ int port = Integer.parseInt(TurbineServlet.getServerPort());
+
+ if ( (TurbineServlet.getServerScheme().equals("http") &&
+ port != 80) ||
+ (TurbineServlet.getServerScheme().equals("https") &&
+ port != 443)
)
{
url.append (":");
- url.append ( data.getServerPort() );
+ url.append ( TurbineServlet.getServerPort() );
}
- url.append ( data.getServerData().getScriptName() );
+ url.append ( TurbineServlet.getScriptName() );
turbineURL = url.toString();
MD5 md5 = new MD5();
turbineId = Bytes.toString(md5.digest(url.toString().getBytes()));
- Log.info("This is Turbine instance running at: " + url);
- Log.info("The instance id is #" + turbineId);
+ getCategory().info("This is Turbine instance running at: " + url);
+ getCategory().info("The instance id is #" + turbineId);
+
setInit(true);
}
@@ -116,7 +125,8 @@
*/
public void shutdown()
{
- Log.info("Turbine instance running at " + turbineURL + " shutting down.");
+ getCategory().info(
+ "Turbine instance running at " + turbineURL + " shutting down.");
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
