Author: jbonofre
Date: Mon Jul 25 17:36:35 2011
New Revision: 1150798
URL: http://svn.apache.org/viewvc?rev=1150798&view=rev
Log:
[KARAF-752] Editorial fixes in the assemblies configuration files
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/README
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/README
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/ext/README
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg?rev=1150798&r1=1150797&r2=1150798&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.management.cfg
Mon Jul 25 17:36:35 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/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg?rev=1150798&r1=1150797&r2=1150798&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
Mon Jul 25 17:36:35 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/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg?rev=1150798&r1=1150797&r2=1150798&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
Mon Jul 25 17:36:35 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/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties?rev=1150798&r1=1150797&r2=1150798&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/system.properties
Mon Jul 25 17:36:35 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/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties?rev=1150798&r1=1150797&r2=1150798&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/etc/users.properties
Mon Jul 25 17:36:35 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 have 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/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/README
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/README?rev=1150798&r1=1150797&r2=1150798&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/README
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/README
Mon Jul 25 17:36:35 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/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/README
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/README?rev=1150798&r1=1150797&r2=1150798&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/README
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/endorsed/README
Mon Jul 25 17:36:35 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/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/ext/README
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/ext/README?rev=1150798&r1=1150797&r2=1150798&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/ext/README
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/distribution/text/lib/ext/README
Mon Jul 25 17:36:35 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/spec.html
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt?rev=1150798&r1=1150797&r2=1150798&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt
Mon Jul 25 17:36:35 2011
@@ -20,7 +20,7 @@ EMBEDDING KARAF IN A WEB APPLICATION
Purpose
-------
-Embed Karaf in a web application.
+To embed Karaf in a web application.
Prerequisites for Running the Example
