aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1461060 - in /aries/trunk/blueprint: blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java blueprint-sample-war/src/main/resources/META-INF/test.xml blueprint-sample-war/src/main/webapp/WEB-INF/web.xml
Date Tue, 26 Mar 2013 11:00:22 GMT
Author: gnodet
Date: Tue Mar 26 11:00:22 2013
New Revision: 1461060

URL: http://svn.apache.org/r1461060
Log:
[ARIES-1038] Change placeholder default value for system properties are the default usage
should be to come from the container

Modified:
    aries/trunk/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
    aries/trunk/blueprint/blueprint-sample-war/src/main/resources/META-INF/test.xml
    aries/trunk/blueprint/blueprint-sample-war/src/main/webapp/WEB-INF/web.xml

Modified: aries/trunk/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java?rev=1461060&r1=1461059&r2=1461060&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
(original)
+++ aries/trunk/blueprint/blueprint-noosgi/src/main/java/org/apache/aries/blueprint/ext/PropertyPlaceholder.java
Tue Mar 26 11:00:22 2013
@@ -50,7 +50,7 @@ public class PropertyPlaceholder extends
     private Properties properties;
     private List<String> locations;
     private boolean ignoreMissingLocations;
-    private SystemProperties systemProperties = SystemProperties.fallback;
+    private SystemProperties systemProperties = SystemProperties.override;
     private PropertyEvaluator evaluator = null;
 
     public Map getDefaultProperties() {

Modified: aries/trunk/blueprint/blueprint-sample-war/src/main/resources/META-INF/test.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-war/src/main/resources/META-INF/test.xml?rev=1461060&r1=1461059&r2=1461060&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-war/src/main/resources/META-INF/test.xml (original)
+++ aries/trunk/blueprint/blueprint-sample-war/src/main/resources/META-INF/test.xml Tue Mar
26 11:00:22 2013
@@ -24,7 +24,7 @@
         <bean id="converter2" class="org.apache.aries.blueprint.sample.CurrencyTypeConverter"
/>
     </type-converters>
 
-    <ext:property-placeholder system-properties="override">
+    <ext:property-placeholder>
         <ext:default-properties>
             <ext:property name="name" value="value" />
             <ext:property name="a" value="Hello " />

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=1461060&r1=1461059&r2=1461060&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
11:00:22 2013
@@ -16,8 +16,8 @@
     </context-param>
 
     <listener>
-    <listener-class>org.apache.aries.blueprint.web.BlueprintContextListener</listener-class>
-  </listener>
+        <listener-class>org.apache.aries.blueprint.web.BlueprintContextListener</listener-class>
+    </listener>
 
     <servlet>
         <servlet-name>accounts</servlet-name>



Mime
View raw message