dlr 01/06/07 14:00:30
Modified: src/java/org/apache/turbine/services BaseService.java
BaseUnicastRemoteService.java Service.java
Log:
Leonard indicates that Service's getStatus() instance method should throw
TurbineException--added. Also added license to BaseUnicastRemoteService.java.
Revision Changes Path
1.10 +5 -1
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BaseService.java 2001/06/07 20:37:49 1.9
+++ BaseService.java 2001/06/07 21:00:23 1.10
@@ -55,6 +55,9 @@
*/
import java.util.Properties;
+
+import org.apache.turbine.util.TurbineException;
+
import org.apache.velocity.runtime.configuration.Configuration;
/**
@@ -62,7 +65,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Kevin Burton</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: BaseService.java,v 1.9 2001/06/07 20:37:49 dlr Exp $
+ * @version $Id: BaseService.java,v 1.10 2001/06/07 21:00:23 dlr Exp $
*/
public class BaseService
extends BaseInitable
@@ -166,6 +169,7 @@
* @return The current status of this Service.
*/
public String getStatus()
+ throws TurbineException
{
return (getInit() ? "Initialized." : "Uninitialized.");
}
1.4 +57 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseUnicastRemoteService.java 2001/06/07 20:37:51 1.3
+++ BaseUnicastRemoteService.java 2001/06/07 21:00:24 1.4
@@ -1,10 +1,66 @@
package org.apache.turbine.services;
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * "Apache Turbine", nor may "Apache" appear in their name, without
+ * prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
import java.util.Properties;
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
import javax.servlet.ServletConfig;
+import org.apache.turbine.util.TurbineException;
+
import org.apache.velocity.runtime.configuration.Configuration;
/**
@@ -129,6 +185,7 @@
* @return The current status of this Service.
*/
public String getStatus()
+ throws TurbineException
{
return (getInit() ? "Initialized." : "Uninitialized.");
}
1.10 +9 -2
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Service.java 2001/06/07 20:37:52 1.9
+++ Service.java 2001/06/07 21:00:25 1.10
@@ -55,6 +55,9 @@
*/
import java.util.Properties;
+
+import org.apache.turbine.util.TurbineException;
+
import org.apache.velocity.runtime.configuration.Configuration;
/**
@@ -67,7 +70,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]";>Leonard Richardson</a>
- * @version $Id: Service.java,v 1.9 2001/06/07 20:37:52 dlr Exp $
+ * @version $Id: Service.java,v 1.10 2001/06/07 21:00:25 dlr Exp $
*/
public interface Service
extends Initable
@@ -126,6 +129,10 @@
* Returns the current status of this Service.
*
* @return The current status of this Service.
+ * @exception TurbineException When a {@link java.lang.Throwable} is thrown
+ * determining service status, it is wrapped by a TurbineException (which
+ * should also provide additional information whenever possible).
*/
- public String getStatus();
+ public String getStatus()
+ throws TurbineException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
