Author: gk
Date: Mon May 8 12:50:06 2017
New Revision: 1794355
URL: http://svn.apache.org/viewvc?rev=1794355&view=rev
Log:
- relative resource requires leading slash
Modified:
turbine/core/trunk/conf/test/CompleteTurbineResources.properties
turbine/core/trunk/conf/test/TurbineNonPersistentSchedulerServiceTest.properties
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
Modified: turbine/core/trunk/conf/test/CompleteTurbineResources.properties
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/CompleteTurbineResources.properties?rev=1794355&r1=1794354&r2=1794355&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/CompleteTurbineResources.properties (original)
+++ turbine/core/trunk/conf/test/CompleteTurbineResources.properties Mon May 8
12:50:06 2017
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-
-pipeline.default.descriptor = conf/turbine-classic-pipeline.xml
+# resource relative to context
+pipeline.default.descriptor = /conf/turbine-classic-pipeline.xml
# -------------------------------------------------------------------
#
# L O G 4 J - L O G G I N G
Modified:
turbine/core/trunk/conf/test/TurbineNonPersistentSchedulerServiceTest.properties
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/TurbineNonPersistentSchedulerServiceTest.properties?rev=1794355&r1=1794354&r2=1794355&view=diff
==============================================================================
---
turbine/core/trunk/conf/test/TurbineNonPersistentSchedulerServiceTest.properties
(original)
+++
turbine/core/trunk/conf/test/TurbineNonPersistentSchedulerServiceTest.properties
Mon May 8 12:50:06 2017
@@ -22,7 +22,9 @@
# -------------------------------------------------------------------
log4j.file = /conf/test/Log4j.properties
-pipeline.default.descriptor = conf/turbine-classic-pipeline.xml
+
+# resource relative to context
+pipeline.default.descriptor = /conf/turbine-classic-pipeline.xml
# If module.cache=true, then how large should we make the hashtables
Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1794355&r1=1794354&r2=1794355&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Mon May 8
12:50:06 2017
@@ -399,6 +399,11 @@ public class Turbine
log.debug("Using descriptor path: " + descriptorPath);
}
+ // context resource path has to begin with slash, cft.
context,getResource
+ if (!descriptorPath.startsWith( "/" )) {
+ descriptorPath = "/" + descriptorPath;
+ }
+
InputStream reader = context.getResourceAsStream(descriptorPath);
JAXBContext jaxb = JAXBContext.newInstance(TurbinePipeline.class);
Unmarshaller unmarshaller = jaxb.createUnmarshaller();
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java?rev=1794355&r1=1794354&r2=1794355&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
Mon May 8 12:50:06 2017
@@ -51,7 +51,7 @@ public class TurbinePipeline
* The "Turbine Classic" pipeline.
*/
public static final String CLASSIC_PIPELINE =
- "WEB-INF/conf/turbine-classic-pipeline.xml";
+ "/WEB-INF/conf/turbine-classic-pipeline.xml";
/**
* Name of this pipeline.
