You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/06/14 16:40:05 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/intake IntakeService.java TurbineIntakeService.java
jvanzyl 01/06/14 07:40:05
Modified: src/java/org/apache/turbine/services/intake
IntakeService.java TurbineIntakeService.java
Log:
- updating service as per notes.
Revision Changes Path
1.9 +2 -1 jakarta-turbine/src/java/org/apache/turbine/services/intake/IntakeService.java
Index: IntakeService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/IntakeService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- IntakeService.java 2001/06/04 04:01:37 1.8
+++ IntakeService.java 2001/06/14 14:40:05 1.9
@@ -65,7 +65,7 @@
* on an XML specification.
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: IntakeService.java,v 1.8 2001/06/04 04:01:37 dlr Exp $
+ * @version $Id: IntakeService.java,v 1.9 2001/06/14 14:40:05 jvanzyl Exp $
*/
public interface IntakeService
{
@@ -144,7 +144,8 @@
* @param groupName the name of the group.
* @param capacity the new capacity.
*/
- public void setCapacity(String groupName, int capacity);
+ public void setCapacity(String groupName,
+ int capacity);
/**
* Gets the current size of the pool for a named group.
1.14 +11 -16 jakarta-turbine/src/java/org/apache/turbine/services/intake/TurbineIntakeService.java
Index: TurbineIntakeService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/intake/TurbineIntakeService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TurbineIntakeService.java 2001/05/19 21:44:07 1.13
+++ TurbineIntakeService.java 2001/06/14 14:40:05 1.14
@@ -70,20 +70,14 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
-import javax.servlet.ServletConfig;
import org.apache.turbine.om.OMTool;
-import org.apache.turbine.services.BaseInitable;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.intake.model.Group;
import org.apache.turbine.services.intake.transform.XmlToAppData;
import org.apache.turbine.services.intake.xmlmodel.AppData;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.services.intake.xmlmodel.XmlGroup;
-import org.apache.turbine.util.Log;
-import org.apache.turbine.util.ServletUtils;
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.pool.BoundedBuffer;
import org.apache.turbine.util.pool.Recyclable;
@@ -94,10 +88,10 @@
* on an XML specification.
*
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
- * @version $Id: TurbineIntakeService.java,v 1.13 2001/05/19 21:44:07 jon Exp $
+ * @version $Id: TurbineIntakeService.java,v 1.14 2001/06/14 14:40:05 jvanzyl Exp $
*/
public class TurbineIntakeService
- extends TurbineBaseService
+ extends BaseService
implements IntakeService
{
/** Array of group names. */
@@ -142,17 +136,18 @@
*
* @param config A ServletConfig.
*/
- public void init(ServletConfig config)
+ public void init()
throws InitializationException
{
- Properties props = getProperties();
- String xmlPath = props.getProperty(XML_PATH);
+ String xmlPath = getConfiguration().getString(XML_PATH);
+
+ //!! need a constant
String appDataPath = "WEB-INF/appData.ser";
try
{
// If possible, transform paths to be webapp root relative.
- xmlPath = ServletUtils.expandRelative(config, xmlPath);
- appDataPath = ServletUtils.expandRelative(config, appDataPath);
+ xmlPath = getRealPath(xmlPath);
+ appDataPath = getRealPath(appDataPath);
File serialAppData = new File(appDataPath);
File xmlFile = new File(xmlPath);
if ( serialAppData.exists()
@@ -253,7 +248,7 @@
}
if ( noMatch )
{
- Log.error("Property, " + propName + " for class, " +
+ getCategory().error("Property, " + propName + " for class, " +
className + " could not be found.");
}
}
@@ -557,7 +552,7 @@
}
catch (Exception e)
{
- Log.error(e);
+ getCategory().error(e);
}
}
}
@@ -587,7 +582,7 @@
}
catch (Exception e)
{
- Log.error(e);
+ getCategory().error(e);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org