quintonm 2003/03/14 09:33:39
Modified: src/java/org/apache/turbine/services/avaloncomponent
AvalonComponentService.java
TurbineAvalonComponentService.java
Log:
The property keys used to find the config files are now constants defined
in AvalonComponentService
Revision Changes Path
1.5 +8 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/AvalonComponentService.java
Index: AvalonComponentService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/AvalonComponentService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AvalonComponentService.java 9 Mar 2003 03:06:25 -0000 1.4
+++ AvalonComponentService.java 14 Mar 2003 17:33:38 -0000 1.5
@@ -56,6 +56,7 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
+
import org.apache.turbine.services.Service;
/**
@@ -69,6 +70,12 @@
{
/** The publically visible name of the service */
String SERVICE_NAME = "AvalonComponentService";
+
+ /** property specifing file name of the component config file */
+ String COMPONENT_CONFIG = "componentConfiguration";
+
+ /** property specifing file name of the component role file */
+ String COMPONENT_ROLE = "componentRoles";
/**
* Returns an instance of the named component
1.8 +3 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java
Index: TurbineAvalonComponentService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineAvalonComponentService.java 13 Mar 2003 15:37:22 -0000 1.7
+++ TurbineAvalonComponentService.java 14 Mar 2003 17:33:39 -0000 1.8
@@ -158,9 +158,9 @@
{
// get the filenames and expand them relative to webapp root
String sysConfigFilename = Turbine.getRealPath(
- getConfiguration().getString("componentConfiguration"));
+ getConfiguration().getString(COMPONENT_CONFIG));
String roleConfigFilename = Turbine.getRealPath(
- getConfiguration().getString("componentRoles"));
+ getConfiguration().getString(COMPONENT_ROLE));
// process configuration files
DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
