servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1091065 - in /servicemix/smx4/features/trunk/assembly: pom.xml src/main/distribution/text/etc/custom.properties src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg
Date Mon, 11 Apr 2011 13:25:58 GMT
Author: gertv
Date: Mon Apr 11 13:25:58 2011
New Revision: 1091065

URL: http://svn.apache.org/viewvc?rev=1091065&view=rev
Log:
SMX4-804: Ensure bundles get properly installed using OBR

Added:
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg
      - copied, changed from r1090755, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties
Modified:
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1091065&r1=1091064&r2=1091065&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Apr 11 13:25:58 2011
@@ -104,6 +104,7 @@
             <groupId>org.apache.xerces</groupId>
             <artifactId>xercesImpl</artifactId>
         </dependency>
+
         <!--xalan jar to be included in lib/endorsed-->
         <dependency>
             <groupId>xalan</groupId>

Modified: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties?rev=1091065&r1=1091064&r2=1091065&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties
Mon Apr 11 13:25:58 2011
@@ -24,8 +24,6 @@
 
 karaf.systemBundlesStartLevel=50
 
-obr.repository.url=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/repository.xml
-
 # javax.transaction is needed to avoid class loader constraint violation when using javax.sql
 # as servicemix is using sun saaj impl bundle, we should ignore this package
 org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,!com.sun.xml.messaging.saaj.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*

Copied: servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg
(from r1090755, servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg?p2=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg&p1=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties&r1=1090755&r2=1091065&rev=1091065&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.features.obr.cfg
Mon Apr 11 13:25:58 2011
@@ -18,23 +18,11 @@
 ################################################################################
 
 #
-# You can place any customized configuration here.
-# All the values specified here will override the default value.
+# This configuration file is used to configure the default values for features OBR resolver
 #
 
-karaf.systemBundlesStartLevel=50
-
-obr.repository.url=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/repository.xml
-
-# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
-# as servicemix is using sun saaj impl bundle, we should ignore this package
-org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,!com.sun.xml.messaging.saaj.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*
-
-
-org.osgi.framework.system.packages.extra = \
-  org.apache.karaf.branding; \
-  com.sun.org.apache.xalan.internal.xsltc.trax; \
-  com.sun.org.apache.xerces.internal.dom; \
-  com.sun.org.apache.xerces.internal.jaxp; \
-  com.sun.org.apache.xerces.internal.xni; \
-  com.sun.jndi.ldap
+#
+# Defines whether or not the features OBR resolver has to resolve optional imports as well.
 The default value is
+# false (do not attempt to resolve optional imports).
+#
+resolveOptionalImports = true



Mime
View raw message