You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by dj...@apache.org on 2011/08/31 08:10:03 UTC
svn commit: r1163502 - in /karaf/trunk/assemblies: apache-karaf-full/
apache-karaf-minimal/
features/framework/src/main/filtered-resources/resources/etc/
features/framework/src/main/resources/resources/etc/
features/framework/src/main/resources/resourc...
Author: djencks
Date: Wed Aug 31 06:10:02 2011
New Revision: 1163502
URL: http://svn.apache.org/viewvc?rev=1163502&view=rev
Log:
KARAF-424 fix up new style assemblies to be more similar to old styles ones
Added:
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.obr.cfg
- copied, changed from r1163501, karaf/trunk/assemblies/features/full/src/main/resources/resources/lib/endorsed/README
Modified:
karaf/trunk/assemblies/apache-karaf-full/pom.xml
karaf/trunk/assemblies/apache-karaf-minimal/pom.xml
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/shell.init.script
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/users.properties
karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/README
karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/endorsed/README
karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/ext/README
karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/shell.init.script
karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/users.properties
karaf/trunk/assemblies/features/full/src/main/resources/resources/lib/README
karaf/trunk/assemblies/features/full/src/main/resources/resources/lib/endorsed/README
karaf/trunk/assemblies/features/full/src/main/resources/resources/lib/ext/README
karaf/trunk/assemblies/features/standard/pom.xml
Modified: karaf/trunk/assemblies/apache-karaf-full/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf-full/pom.xml?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf-full/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf-full/pom.xml Wed Aug 31 06:10:02 2011
@@ -117,6 +117,8 @@
</executions>
<configuration>
<bootFeatures>
+ <feature>org.apache.karaf.feature.standard</feature>
+ <feature>org.apache.karaf.feature.full</feature>
<feature>org.apache.karaf.feature.standard.management</feature>
<feature>org.apache.karaf.feature.standard.ssh</feature>
<feature>org.apache.karaf.feature.standard.config</feature>
Modified: karaf/trunk/assemblies/apache-karaf-minimal/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf-minimal/pom.xml?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf-minimal/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf-minimal/pom.xml Wed Aug 31 06:10:02 2011
@@ -105,6 +105,7 @@
</executions>
<configuration>
<bootFeatures>
+ <feature>org.apache.karaf.feature.standard</feature>
<feature>org.apache.karaf.feature.standard.management</feature>
</bootFeatures>
</configuration>
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties Wed Aug 31 06:10:02 2011
@@ -308,3 +308,165 @@ jre-1.6= \
org.xml.sax, \
org.xml.sax.ext, \
org.xml.sax.helpers
+
+# Standard package set. Note that:
+# - javax.transaction* is exported with a mandatory attribute
+jre-1.7= \
+ javax.accessibility, \
+ javax.activation, \
+ javax.activity, \
+ javax.annotation;version="1.1", \
+ javax.annotation.processing;version="1.1", \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+ javax.jws, \
+ javax.jws.soap, \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.script, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.tools, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+ javax.xml.bind, \
+ javax.xml.bind.annotation, \
+ javax.xml.bind.annotation.adapters, \
+ javax.xml.bind.attachment, \
+ javax.xml.bind.helpers, \
+ javax.xml.bind.util, \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.soap, \
+ javax.xml.stream, \
+ javax.xml.stream.events, \
+ javax.xml.stream.util, \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+ javax.xml.ws, \
+ javax.xml.ws.handler, \
+ javax.xml.ws.handler.soap, \
+ javax.xml.ws.http, \
+ javax.xml.ws.soap, \
+ javax.xml.ws.spi, \
+ javax.xml.ws.wsaddressing, \
+ javax.xml.xpath, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA.DynAnyPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.SendingContext, \
+ org.omg.stub.java.rmi, \
+ org.omg.stub.javax.management.remote.rmi, \
+ org.w3c.dom, \
+ org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
+ org.w3c.dom.events, \
+ org.w3c.dom.html, \
+ org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.w3c.dom.xpath, \
+ org.xml.sax, \
+ org.xml.sax.ext, \
+ org.xml.sax.helpers
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg Wed Aug 31 06:10:02 2011
@@ -20,9 +20,9 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/org.apache.karaf.feature.standard/${project.version}/xml/features,mvn:org.apache.karaf.assemblies.features/org.apache.karaf.feature.enterprise/${project.version}/xml/features
#
# Comma separated list of features to install at startup
#
-featuresBoot=
+featuresBoot=org.apache.karaf.feature.config,org.apache.karaf.feature.ssh,org.apache.karaf.feature.management
Copied: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.obr.cfg (from r1163501, karaf/trunk/assemblies/features/full/src/main/resources/resources/lib/endorsed/README)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.obr.cfg?p2=karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.obr.cfg&p1=karaf/trunk/assemblies/features/full/src/main/resources/resources/lib/endorsed/README&r1=1163501&r2=1163502&rev=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/full/src/main/resources/resources/lib/endorsed/README (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.obr.cfg Wed Aug 31 06:10:02 2011
@@ -17,7 +17,12 @@
#
################################################################################
-This directory is the Java endorsed directory.
-Any jar in this folder will be used to override classes defined by the JVM.
-For more information, see:
- http://download.oracle.com/javase/6/docs/technotes/guides/extensions/spec.html
+#
+# This configuration file is used to configure the default values for features OBR resolver
+#
+
+#
+# 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 = false
\ No newline at end of file
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg Wed Aug 31 06:10:02 2011
@@ -18,7 +18,7 @@
################################################################################
#
-# The properties in this file define the configuration of Apache Karafs JMX Management
+# The properties in this file define the configuration of Apache Karaf's JMX Management
#
#
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg Wed Aug 31 06:10:02 2011
@@ -18,22 +18,22 @@
################################################################################
#
-# These properties are used to configure karafs ssh shell.
+# These properties are used to configure Karaf's ssh shell.
#
#
-# Via sshPort and sshHost you define at which address you can login into karaf.
+# Via sshPort and sshHost you define the address you can login into Karaf.
#
sshPort=8101
sshHost=0.0.0.0
#
-# sshRealm defines which jaas domain to use for password authentication.
+# sshRealm defines which JAAS domain to use for password authentication.
#
sshRealm=karaf
#
# The location of the hostKey file defines where the private/public key of the server
-# could be found. If no file is at the defined location it will be ignored.
+# is located. If no file is at the defined location it will be ignored.
#
hostKey=${karaf.base}/etc/host.key
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg Wed Aug 31 06:10:02 2011
@@ -18,7 +18,7 @@
################################################################################
# Root logger
-log4j.rootLogger=INFO, out, osgi:VmLogAppender
+log4j.rootLogger=INFO, out, osgi:*
log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
# CONSOLE appender not used by default
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg Wed Aug 31 06:10:02 2011
@@ -19,12 +19,12 @@
#
# If set to true, the following property will not allow any certificate to be used
-# when accessing maven repositories through SSL
+# when accessing Maven repositories through SSL
#
#org.ops4j.pax.url.mvn.certificateCheck=
#
-# Path to the local maven settings file.
+# Path to the local Maven settings file.
# The repositories defined in this file will be automatically added to the list
# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
# below is not set.
@@ -37,7 +37,7 @@
#org.ops4j.pax.url.mvn.settings=
#
-# Path to the local maven repository which is used to avoid downloading
+# Path to the local Maven repository which is used to avoid downloading
# artifacts when they already exist locally.
# The value of this property will be extracted from the settings.xml file
# above, or defaulted to:
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/shell.init.script
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/shell.init.script?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/shell.init.script (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/shell.init.script Wed Aug 31 06:10:02 2011
@@ -22,4 +22,5 @@
//
ld = { log:display $args } ;
lde = { log:display-exception $args } ;
-la = { osgi:list -t 0 $args } ;
\ No newline at end of file
+la = { osgi:list -t 0 $args } ;
+cl = { config:list "(service.pid=$args)" } ;
\ No newline at end of file
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties Wed Aug 31 06:10:02 2011
@@ -31,13 +31,13 @@
org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
#
-# Name of this karaf instance.
+# Name of this Karaf instance.
#
karaf.name=root
#
# Default repository where bundles will be loaded from before using
-# other maven repositories. For the full maven configuration, see
+# other Maven repositories. For the full Maven configuration, see
# the org.ops4j.pax.url.mvn.cfg file.
#
karaf.default.repository=system
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/users.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/users.properties?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/users.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/users.properties Wed Aug 31 06:10:02 2011
@@ -18,13 +18,13 @@
################################################################################
#
-# This file contains the users valid to log into karaf. Each line have to be of
+# This file contains the valid users who can log into Karaf. Each line has to be of
# the format:
#
# USER=PASSWORD,ROLE1,ROLE2,...
#
-# All users and roles entered in this file are available after karaf's startup
-# and modifiable via the jaas command group. These users reside in a jaas domain
-# with the name karaf.
+# All users and roles entered in this file are available after Karaf startup
+# and modifiable via the JAAS command group. These users reside in a JAAS domain
+# with the name "karaf"..
#
karaf=karaf,admin
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/README
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/README?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/README (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/README Wed Aug 31 06:10:02 2011
@@ -17,11 +17,11 @@
#
################################################################################
-This directory is the standard java classpath directory.
+This directory is the standard Java classpath directory.
Any jar in this folder will be part of the main classloader used to load Karaf.
-However, in OSGi, classes defined in this jar won't be available to other bundles
-unless one of the org.osgi.framework.system.packages.extra or
-org.osgi.framework.bootdelegation property in the etc/config.properties file
+However, in OSGi, classes defined in these jars won't be available to other
+bundles unless one of the org.osgi.framework.system.packages.extra or
+org.osgi.framework.bootdelegation properties in the etc/config.properties file
is modified to export or delegate the packages.
-Please refer to the OSGi Core Specification for more informations on those
+Please refer to the OSGi Core Specification for more information on these
properties and the OSGi classloading mechanism.
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/endorsed/README
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/endorsed/README?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/endorsed/README (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/endorsed/README Wed Aug 31 06:10:02 2011
@@ -17,7 +17,7 @@
#
################################################################################
-This directory is the java endorsed directory.
+This directory is the Java endorsed directory.
Any jar in this folder will be used to override classes defined by the JVM.
-For more informations, see:
- http://java.sun.com/j2se/1.5.0/docs/guide/standards/
+For more information, see:
+ http://download.oracle.com/javase/6/docs/technotes/guides/standards/
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/ext/README
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/ext/README?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/ext/README (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/lib/ext/README Wed Aug 31 06:10:02 2011
@@ -17,7 +17,7 @@
#
################################################################################
-This directory is the java extension directory.
+This directory is the Java extension directory.
Any jar in this folder will be used as a JVM extension.
-For more informations, see
- http://java.sun.com/j2se/1.5.0/docs/guide/extensions/spec.html
+For more information, see
+ http://download.oracle.com/javase/6/docs/technotes/guides/extensions/specs.html
Modified: karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.apache.karaf.shell.cfg?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.apache.karaf.shell.cfg (original)
+++ karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.apache.karaf.shell.cfg Wed Aug 31 06:10:02 2011
@@ -22,7 +22,7 @@
#
#
-# Via sshPort and sshHost you define the address you can login into karaf.
+# Via sshPort and sshHost you define the address you can login into Karaf.
#
sshPort=8101
sshHost=0.0.0.0
Modified: karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg (original)
+++ karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg Wed Aug 31 06:10:02 2011
@@ -18,7 +18,7 @@
################################################################################
# Root logger
-log4j.rootLogger=INFO, out, osgi:VmLogAppender
+log4j.rootLogger=INFO, out, osgi:*
log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
# CONSOLE appender not used by default
Modified: karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg (original)
+++ karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg Wed Aug 31 06:10:02 2011
@@ -73,7 +73,7 @@ org.ops4j.pax.url.mvn.disableAether=true
# The following property value will add the system folder as a repo.
#
org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots, \
- file:${karaf.home}/local-repo@snapshots
+ file:${karaf.home}/local-repo@snapshots
#
# Comma separated list of repositories scanned when resolving an artifact.
@@ -88,12 +88,13 @@ org.ops4j.pax.url.mvn.defaultRepositorie
# A repository url can be appended with zero or more of the following flags:
# @snapshots : the repository contains snaphots
# @noreleases : the repository does not contain any released artifacts
+# @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet
#
org.ops4j.pax.url.mvn.repositories= \
- http://repo1.maven.org/maven2, \
- http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases, \
- http://svn.apache.org/repos/asf/servicemix/m2-repo, \
- http://repository.springsource.com/maven/bundles/release, \
- http://repository.springsource.com/maven/bundles/external, \
+ http://repo1.maven.org/maven2@id=central, \
+ http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \
+ http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix, \
+ http://repository.springsource.com/maven/bundles/release@id=springsource, \
+ http://repository.springsource.com/maven/bundles/external@id=springsourceext, \
http://oss.sonatype.org/content/repositories/releases/@id=sonatype
Modified: karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/shell.init.script
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/shell.init.script?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/shell.init.script (original)
+++ karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/shell.init.script Wed Aug 31 06:10:02 2011
@@ -22,4 +22,5 @@
//
ld = { log:display $args } ;
lde = { log:display-exception $args } ;
-la = { osgi:list -t 0 $args } ;
\ No newline at end of file
+la = { osgi:list -t 0 $args } ;
+cl = { config:list "(service.pid=$args)" } ;
\ No newline at end of file
Modified: karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/users.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/users.properties?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/users.properties (original)
+++ karaf/trunk/assemblies/features/full/src/main/resources/resources/etc/users.properties Wed Aug 31 06:10:02 2011
@@ -18,13 +18,13 @@
################################################################################
#
-# This file contains the valid users who can log into Karaf. Each line have to be of
+# This file contains the valid users who can log into Karaf. Each line has to be of
# the format:
#
# USER=PASSWORD,ROLE1,ROLE2,...
#
# All users and roles entered in this file are available after Karaf startup
# and modifiable via the JAAS command group. These users reside in a JAAS domain
-# with the name Karaf.
+# with the name "karaf"..
#
karaf=karaf,admin
Modified: karaf/trunk/assemblies/features/standard/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/pom.xml?rev=1163502&r1=1163501&r2=1163502&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/pom.xml (original)
+++ karaf/trunk/assemblies/features/standard/pom.xml Wed Aug 31 06:10:02 2011
@@ -164,6 +164,7 @@
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<configuration>
+ <startLevel>30</startLevel>
</configuration>
<executions>
<execution>