Author: rineholt
Date: Mon Sep 25 03:59:21 2006
New Revision: 449642
URL: http://svn.apache.org/viewvc?view=rev&rev=449642
Log:
Make default extensions location agree with
org.apache.tuscany.plugin.war.TuscanyWarMojo
Modified:
incubator/tuscany/java/sca/runtime/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java
incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java
Modified:
incubator/tuscany/java/sca/runtime/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java?view=diff&rev=449642&r1=449641&r2=449642
==============================================================================
---
incubator/tuscany/java/sca/runtime/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java
(original)
+++
incubator/tuscany/java/sca/runtime/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java
Mon Sep 25 03:59:21 2006
@@ -44,7 +44,7 @@
public void testBootWithDefaults() throws Exception {
expect(context.getInitParameter(Constants.SYSTEM_MONITORING_PARAM)).andReturn(null);
expect(context.getInitParameter(Constants.EXTENSION_SCDL_PATH_PARAM)).andReturn(null);
-
expect(context.getResourcePaths("/META-INF/tuscany.extensions")).andReturn(null);
+
expect(context.getResourcePaths("/WEB-INF/tuscany/extensions")).andReturn(null);
expect(context.getServletContextName()).andReturn("foo");
expect(context.getInitParameter(Constants.CURRENT_COMPOSITE_PATH_PARAM)).andReturn(null);
context.setAttribute(eq(Constants.RUNTIME_ATTRIBUTE),
isA(WebappRuntime.class));
Modified:
incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java?view=diff&rev=449642&r1=449641&r2=449642
==============================================================================
---
incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java
(original)
+++
incubator/tuscany/java/sca/runtime/webapp/src/main/java/org/apache/tuscany/runtime/webapp/Constants.java
Mon Sep 25 03:59:21 2006
@@ -69,8 +69,8 @@
/**
* Default path for extensions if no "extensionScdlPath param is specified
*/
- static final String DEFAULT_EXTENSION_PATH_PARAM =
"/META-INF/tuscany.extensions";
-
+ static final String DEFAULT_EXTENSION_PATH_PARAM =
"/WEB-INF/tuscany/extensions";
+
/**
* Servlet context-param name for system monitoring level. Supported
values are the names of statics defined in
* java.util.logging.Level. If absent, no monitoring will take place.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]