Author: tv
Date: Wed Aug 15 17:54:18 2018
New Revision: 1838126
URL: http://svn.apache.org/viewvc?rev=1838126&view=rev
Log:
Add ServiceBroker.getApplicationRoot() to allow services to get their root
directory
Modified:
turbine/core/trunk/src/changes/changes.xml
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
Modified: turbine/core/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/changes/changes.xml?rev=1838126&r1=1838125&r2=1838126&view=diff
==============================================================================
--- turbine/core/trunk/src/changes/changes.xml (original)
+++ turbine/core/trunk/src/changes/changes.xml Wed Aug 15 17:54:18 2018
@@ -26,6 +26,9 @@
<body>
<release version="5.0" date="in Subversion">
<action type="add" dev="tv">
+ Add ServiceBroker.getApplicationRoot() to allow services to get their
root directory
+ </action>
+ <action type="add" dev="tv">
Add Turbine.getApplicationRootAsFile()
</action>
<action type="update" dev="tv">
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java?rev=1838126&r1=1838125&r2=1838126&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
Wed Aug 15 17:54:18 2018
@@ -720,6 +720,7 @@ public abstract class BaseServiceBroker
*
* @return String application root
*/
+ @Override
public String getApplicationRoot()
{
return applicationRoot;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java?rev=1838126&r1=1838125&r2=1838126&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
Wed Aug 15 17:54:18 2018
@@ -102,4 +102,12 @@ public interface ServiceBroker
* @return Configuration of the requested service.
*/
Configuration getConfiguration(String name);
+
+ /**
+ * Get the application root as set by
+ * the parent application.
+ *
+ * @return String application root
+ */
+ String getApplicationRoot();
}
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java?rev=1838126&r1=1838125&r2=1838126&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
Wed Aug 15 17:54:18 2018
@@ -33,7 +33,6 @@ import org.apache.commons.logging.LogFac
import org.apache.fulcrum.yaafi.framework.container.ServiceContainer;
import
org.apache.fulcrum.yaafi.framework.factory.ServiceContainerConfiguration;
import org.apache.fulcrum.yaafi.framework.factory.ServiceContainerFactory;
-import org.apache.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.InstantiationException;
import org.apache.turbine.services.TurbineBaseService;
@@ -113,16 +112,10 @@ public class TurbineYaafiComponentServic
public void initialize() throws Exception
{
// get the configuration from the baseclass
-
Configuration conf = this.getConfiguration();
// determine the home directory
- String homePath = Turbine.getRealPath("/");
- if (homePath == null)
- {
- homePath = Turbine.getApplicationRoot();
- }
- File home = new File(homePath);
+ File home = new File(getServiceBroker().getApplicationRoot());
log.info("Using the following home : " + home.getAbsolutePath());
// create the configuration for YAAFI
Modified:
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java?rev=1838126&r1=1838125&r2=1838126&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
Wed Aug 15 17:54:18 2018
@@ -26,7 +26,6 @@ import static org.junit.Assert.fail;
import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.configuration2.Configuration;
-import org.apache.turbine.Turbine;
import org.apache.turbine.services.ServiceManager;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.test.BaseTestCase;
@@ -57,7 +56,6 @@ public class TurbineAvalonComponentServi
*/
@Test public void testGetAndUseTestComponent()
{
- Turbine.setApplicationRoot(".");
ServiceManager serviceManager = TurbineServices.getInstance();
serviceManager.setApplicationRoot(".");
