You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2013/03/26 10:24:13 UTC
svn commit: r1461033 - in /aries/trunk/blueprint:
blueprint-sample-war/src/main/webapp/WEB-INF/web.xml
blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java
Author: gnodet
Date: Tue Mar 26 09:24:13 2013
New Revision: 1461033
URL: http://svn.apache.org/r1461033
Log:
[ARIES-1038] Use a more specific context-param name to avoid clashes
Modified:
aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/web.xml
aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java
Modified: aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/web.xml?rev=1461033&r1=1461032&r2=1461033&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/web.xml (original)
+++ aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/web.xml Tue Mar 26 09:24:13 2013
@@ -6,7 +6,7 @@
<display-name>blueprint web sample</display-name>
<context-param>
- <param-name>location</param-name>
+ <param-name>blueprintLocation</param-name>
<param-value>META-INF/test.xml</param-value>
</context-param>
Modified: aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java?rev=1461033&r1=1461032&r2=1461033&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java (original)
+++ aries/trunk/blueprint/blueprint-web/src/main/java/org/apache/aries/blueprint/web/BlueprintContextListener.java Tue Mar 26 09:24:13 2013
@@ -35,7 +35,7 @@ public class BlueprintContextListener im
public static final String CONTAINER_ATTRIBUTE = "org.apache.aries.blueprint.container";
- public static final String LOCATION = "location";
+ public static final String LOCATION = "blueprintLocation";
public static final String DEFAULT_LOCATION = "META-INF/blueprint.xml";