You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by ga...@apache.org on 2011/04/27 21:01:47 UTC

svn commit: r1097206 - /geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml

Author: gawor
Date: Wed Apr 27 19:01:47 2011
New Revision: 1097206

URL: http://svn.apache.org/viewvc?rev=1097206&view=rev
Log:
GERONIMO-5935: Expose a system property to control whether optional bundles should be provisioned during EBA install or not

Modified:
    geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml?rev=1097206&r1=1097205&r2=1097206&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml (original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml Wed Apr 27 19:01:47 2011
@@ -16,15 +16,22 @@
     limitations under the License.
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
+    <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]">
+        <ext:default-properties>
+            <ext:property name="ariesApplicationResolver.returnOptionalResources" value="false" />
+        </ext:default-properties>
+    </ext:property-placeholder>
+
     <bean id="obr-resolver" class="org.apache.aries.application.resolver.obr.OBRAriesResolver" scope="singleton"
           activation="eager">
         <argument>
             <reference interface="org.apache.felix.bundlerepository.RepositoryAdmin"/>
         </argument>
-        <property name="returnOptionalResources" value="false"/>
+        <property name="returnOptionalResources" value="$[ariesApplicationResolver.returnOptionalResources]"/>
     </bean>
 
     <service interface="org.apache.aries.application.management.AriesApplicationResolver" ref="obr-resolver" ranking="5" />