You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/06/13 08:35:56 UTC

[1/2] git commit: [KARAF-3033] The system bundle should export and boot delegate javax.xml.crypto packages

Repository: karaf
Updated Branches:
  refs/heads/master b793c7be9 -> 3e9ac4c71


[KARAF-3033] The system bundle should export and boot delegate javax.xml.crypto packages


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3e9ac4c7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3e9ac4c7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3e9ac4c7

Branch: refs/heads/master
Commit: 3e9ac4c7134440bdf2dd9a313c9e8e08bd371837
Parents: 86686e1
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Fri Jun 13 08:28:04 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Jun 13 08:35:50 2014 +0200

----------------------------------------------------------------------
 .../src/main/filtered-resources/resources/etc/config.properties    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/3e9ac4c7/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
index 3c038eb..241ebc7 100644
--- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
@@ -144,7 +144,7 @@ eecap-1.2= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1", \
 #
 # javax.transaction is needed to avoid class loader constraint violation when using javax.sql
 #
-org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,org.apache.karaf.management.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.*,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom
+org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,org.apache.karaf.management.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.*,javax.xml.crypto,javax.xml.crypto.*,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom
 
 #
 # OSGi Execution Environment


[2/2] git commit: [KARAF-2986] Use urls for features repository completion mapping

Posted by gn...@apache.org.
[KARAF-2986] Use urls for features repository completion mapping


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/86686e1b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/86686e1b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/86686e1b

Branch: refs/heads/master
Commit: 86686e1b4c876e6a1817caa2e55e80a9763a07a7
Parents: b793c7b
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Jun 12 13:06:56 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Jun 13 08:35:50 2014 +0200

----------------------------------------------------------------------
 .../etc/org.apache.karaf.features.repos.cfg     | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/86686e1b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg
index 8de9e15..97ef776 100644
--- a/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg
+++ b/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg
@@ -22,15 +22,15 @@
 # It could be directly installed using feature:repo-add command
 #
 
-enterprise   = mvn:org.apache.karaf.features/enterprise/${version}/xml/features
-cellar       = mvn:org.apache.karaf.cellar/apache-karaf-cellar/${version}/xml/features
-camel        = mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
-camel-extras = mvn:org.apache-extras.camel-extra.karaf/camel-extra/${version}/xml/features
-cxf          = mvn:org.apache.cxf.karaf/apache-cxf/${version}/xml/features
-cxf-dosgi    = mvn:org.apache.cxf.dosgi/cxf-dosgi/${version}/xml/features
-activemq     = mvn:org.apache.activemq/activemq-karaf/${version}/xml/features
-jclouds      = mvn:org.jclouds.karaf/jclouds-karaf/${version}/xml/features
-openejb      = mvn:org.apache.openejb/openejb-feature/${version}/xml/features
-wicket       = mvn:org.ops4j.pax.wicket/features/${version}/xml/features
-hawtio       = mvn:io.hawt/hawtio-karaf/${version}/xml/features
+enterprise   = mvn:org.apache.karaf.features/enterprise/$\\\{version}/xml/features
+cellar       = mvn:org.apache.karaf.cellar/apache-karaf-cellar/$\\\{version}/xml/features
+camel        = mvn:org.apache.camel.karaf/apache-camel/$\\\{version}/xml/features
+camel-extras = mvn:org.apache-extras.camel-extra.karaf/camel-extra/$\\\{version}/xml/features
+cxf          = mvn:org.apache.cxf.karaf/apache-cxf/$\\\{version}/xml/features
+cxf-dosgi    = mvn:org.apache.cxf.dosgi/cxf-dosgi/$\\\{version}/xml/features
+activemq     = mvn:org.apache.activemq/activemq-karaf/$\\\{version}/xml/features
+jclouds      = mvn:org.jclouds.karaf/jclouds-karaf/$\\\{version}/xml/features
+openejb      = mvn:org.apache.openejb/openejb-feature/$\\\{version}/xml/features
+wicket       = mvn:org.ops4j.pax.wicket/features/$\\\{version}/xml/features
+hawtio       = mvn:io.hawt/hawtio-karaf/$\\\{version}/xml/features
 ecf          = http://download.eclipse.org/rt/ecf/latest/site.p2/karaf-features.xml