Index: apache-karaf/src/main/distribution/text/lib/ext/README =================================================================== --- apache-karaf/src/main/distribution/text/lib/ext/README (revision 1148938) +++ apache-karaf/src/main/distribution/text/lib/ext/README (working copy) @@ -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/spec.html Index: apache-karaf/src/main/distribution/text/lib/endorsed/README =================================================================== --- apache-karaf/src/main/distribution/text/lib/endorsed/README (revision 1148938) +++ apache-karaf/src/main/distribution/text/lib/endorsed/README (working copy) @@ -17,7 +17,8 @@ # ################################################################################ -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/ + Index: apache-karaf/src/main/distribution/text/lib/README =================================================================== --- apache-karaf/src/main/distribution/text/lib/README (revision 1148938) +++ apache-karaf/src/main/distribution/text/lib/README (working copy) @@ -17,11 +17,12 @@ # ################################################################################ -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 -is modified to export or delegate the packages. -Please refer to the OSGi Core Specification for more informations on those -properties and the OSGi classloading mechanism. +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 information on these properties and the OSGi classloading +mechanism. Index: apache-karaf/src/main/distribution/text/etc/system.properties =================================================================== --- apache-karaf/src/main/distribution/text/etc/system.properties (revision 1148938) +++ apache-karaf/src/main/distribution/text/etc/system.properties (working copy) @@ -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 Index: apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg =================================================================== --- apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg (revision 1148938) +++ apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg (working copy) @@ -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 # # Index: apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg =================================================================== --- apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg (revision 1148938) +++ apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg (working copy) @@ -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: Index: apache-karaf/src/main/distribution/text/etc/users.properties =================================================================== --- apache-karaf/src/main/distribution/text/etc/users.properties (revision 1148938) +++ apache-karaf/src/main/distribution/text/etc/users.properties (working copy) @@ -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 are modifiable via the JAAS command group. These users reside in a JAAS domain +# with the name "karaf". # karaf=karaf,admin Index: apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg =================================================================== --- apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg (revision 1148938) +++ apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg (working copy) @@ -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 Index: features/full/src/main/filtered-resources/resources/demos/web/README.txt =================================================================== --- features/full/src/main/filtered-resources/resources/demos/web/README.txt (revision 1148938) +++ features/full/src/main/filtered-resources/resources/demos/web/README.txt (working copy) @@ -20,14 +20,14 @@ Purpose ------- -Embed Karaf in a web application. +To embed Karaf in a web application. Prerequisites for Running the Example ------------------------------------- You must have the following installed on your machine: - - JDK 1.5 or higher + - JDK 1.6 - Maven 2.0.9 or higher Index: features/full/src/main/resources/resources/lib/ext/README =================================================================== --- features/full/src/main/resources/resources/lib/ext/README (revision 1148938) +++ features/full/src/main/resources/resources/lib/ext/README (working copy) @@ -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/spec.html Index: features/full/src/main/resources/resources/lib/endorsed/README =================================================================== --- features/full/src/main/resources/resources/lib/endorsed/README (revision 1148938) +++ features/full/src/main/resources/resources/lib/endorsed/README (working copy) @@ -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/ Index: features/full/src/main/resources/resources/lib/README =================================================================== --- features/full/src/main/resources/resources/lib/README (revision 1148938) +++ features/full/src/main/resources/resources/lib/README (working copy) @@ -17,11 +17,12 @@ # ################################################################################ -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 -is modified to export or delegate the packages. -Please refer to the OSGi Core Specification for more informations on those -properties and the OSGi classloading mechanism. +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 information on these properties and the OSGi classloading +mechanism. Index: features/full/src/main/resources/resources/etc/system.properties =================================================================== --- features/full/src/main/resources/resources/etc/system.properties (revision 1148938) +++ features/full/src/main/resources/resources/etc/system.properties (working copy) @@ -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 Index: features/full/src/main/resources/resources/etc/org.apache.karaf.management.cfg =================================================================== --- features/full/src/main/resources/resources/etc/org.apache.karaf.management.cfg (revision 1148938) +++ features/full/src/main/resources/resources/etc/org.apache.karaf.management.cfg (working copy) @@ -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 # # Index: features/full/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg =================================================================== --- features/full/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg (revision 1148938) +++ features/full/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg (working copy) @@ -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: Index: features/full/src/main/resources/resources/etc/users.properties =================================================================== --- features/full/src/main/resources/resources/etc/users.properties (revision 1148938) +++ features/full/src/main/resources/resources/etc/users.properties (working copy) @@ -18,13 +18,14 @@ ################################################################################ # -# 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 are modifiable via the JAAS command group. These users reside in a JAAS domain +# with the name "karaf". # karaf=karaf,admin + Index: features/full/src/main/resources/resources/etc/org.apache.karaf.shell.cfg =================================================================== --- features/full/src/main/resources/resources/etc/org.apache.karaf.shell.cfg (revision 1148938) +++ features/full/src/main/resources/resources/etc/org.apache.karaf.shell.cfg (working copy) @@ -18,22 +18,23 @@ ################################################################################ # -# 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 + Index: features/framework/src/main/resources/resources/lib/ext/README =================================================================== --- features/framework/src/main/resources/resources/lib/ext/README (revision 1148938) +++ features/framework/src/main/resources/resources/lib/ext/README (working copy) @@ -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/spec.html Index: features/framework/src/main/resources/resources/lib/endorsed/README =================================================================== --- features/framework/src/main/resources/resources/lib/endorsed/README (revision 1148938) +++ features/framework/src/main/resources/resources/lib/endorsed/README (working copy) @@ -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/ Index: features/framework/src/main/resources/resources/lib/README =================================================================== --- features/framework/src/main/resources/resources/lib/README (revision 1148938) +++ features/framework/src/main/resources/resources/lib/README (working copy) @@ -17,11 +17,12 @@ # ################################################################################ -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 -is modified to export or delegate the packages. -Please refer to the OSGi Core Specification for more informations on those -properties and the OSGi classloading mechanism. +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 information on these properties and the OSGi classloading +mechanism. Index: features/framework/src/main/resources/resources/etc/system.properties =================================================================== --- features/framework/src/main/resources/resources/etc/system.properties (revision 1148938) +++ features/framework/src/main/resources/resources/etc/system.properties (working copy) @@ -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 Index: features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg =================================================================== --- features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg (revision 1148938) +++ features/framework/src/main/resources/resources/etc/org.apache.karaf.management.cfg (working copy) @@ -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 # # Index: features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg =================================================================== --- features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg (revision 1148938) +++ features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg (working copy) @@ -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: Index: features/framework/src/main/resources/resources/etc/users.properties =================================================================== --- features/framework/src/main/resources/resources/etc/users.properties (revision 1148938) +++ features/framework/src/main/resources/resources/etc/users.properties (working copy) @@ -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 are modifiable via the JAAS command group. These users reside in a JAAS domain +# with the name "karaf". # karaf=karaf,admin Index: features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg =================================================================== --- features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg (revision 1148938) +++ features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg (working copy) @@ -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