geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1066151 - in /geronimo/server/trunk/framework/configs/karaf-framework/src/main: distribution/text/etc/ distribution/unix-shell/bin/ distribution/windows-text/bin/ filtered-resources/etc/
Date Tue, 01 Feb 2011 19:19:53 GMT
Author: gawor
Date: Tue Feb  1 19:19:51 2011
New Revision: 1066151

URL: http://svn.apache.org/viewvc?rev=1066151&view=rev
Log:
update comments and sync configuration with karaf configuration

Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg?rev=1066151&r1=1066150&r2=1066151&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.apache.karaf.shell.cfg
Tue Feb  1 19:19:51 2011
@@ -18,7 +18,22 @@
 ################################################################################
 
 #
+# These properties are used to configure karafs ssh shell.
+#
+
+#
+# Via sshPort and sshHost you define at which address you can login into karaf.
+#
 sshPort=8101
 sshHost=0.0.0.0
+
+#
+# sshRealm defines which jaas domain to use for password authentication.
+#
 sshRealm=geronimo-admin
+
+#
+# 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.
+#
 hostKey=${karaf.base}/etc/host.key

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg?rev=1066151&r1=1066150&r2=1066151&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
Tue Feb  1 19:19:51 2011
@@ -68,8 +68,6 @@ org.ops4j.pax.url.mvn.defaultRepositorie
 #    @snapshots  : the repository contains snaphots
 #    @noreleases : the repository does not contain any released artifacts
 #
-# The following property value will add the system folder as a repo.
-#
 #org.ops4j.pax.url.mvn.repositories= \
 #    http://repo1.maven.org/maven2, \
 #    http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases, \

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties?rev=1066151&r1=1066150&r2=1066151&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
Tue Feb  1 19:19:51 2011
@@ -50,7 +50,7 @@ karaf.shell.init.script=${karaf.home}/et
 xml.catalog.files=
 
 #
-# Suppress the bell in the console when hitting backspace to many times
+# Suppress the bell in the console when hitting backspace too many times
 # for example
 #
 jline.nobell=true

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo?rev=1066151&r1=1066150&r2=1066151&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
Tue Feb  1 19:19:51 2011
@@ -469,22 +469,22 @@ else
   echo "  stop --force      Stop Geronimo (followed by kill -KILL)"
   echo ""
   echo "args for debug, jpda run, jpda start, run and start commands:"
-  echo "  -q     --quiet           No startup progress
-  echo "  -l     --long            Long startup progress
-  echo "  -c     --clean           Clean osgi bundle cache
-  echo "  -v     --verbose         INFO log level
-  echo "  -vv    --veryverbose     DEBUG log level
-  echo "  -vvv   --veryveryverbose Trace log level
-  echo "  -o     --override        Override configurations. USE WITH CAUTION!
-  echo "  -h     --help            Detailed help.
-  echo "  -s     --secure          Enable Geronimo for 2 way secure JMX communication.
+  echo "  -q     --quiet           No startup progress"
+  echo "  -l     --long            Long startup progress"
+  echo "  -c     --clean           Clean OSGi bundle cache"
+  echo "  -v     --verbose         INFO log level"
+  echo "  -vv    --veryverbose     DEBUG log level"
+  echo "  -vvv   --veryveryverbose Trace log level"
+  echo "  -o     --override        Override configurations. USE WITH CAUTION!"
+  echo "  -h     --help            Detailed help."
+  echo "  -s     --secure          Enable Geronimo for two way secure JMX communication."
   echo ""
   echo "args for stop command:"
-  echo "   -u     --user          Admin user
-  echo "   -p     --password      Admin password
-  echo "          --host          Hostname of the server
-  echo "          --port          RMI port to connect to
-  echo "          --secure        Enable secure JMX communication
+  echo "   -u     --user          Admin user"
+  echo "   -p     --password      Admin password"
+  echo "          --host          Hostname of the server"
+  echo "          --port          RMI port to connect to"
+  echo "          --secure        Enable secure JMX communication"
   exit 1
 
 fi

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat?rev=1066151&r1=1066150&r2=1066151&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
Tue Feb  1 19:19:51 2011
@@ -251,13 +251,13 @@ echo.
 echo args for debug, jpda run, jpda start, run and start commands:
 echo   -q     --quiet           No startup progress
 echo   -l     --long            Long startup progress
-echo   -c     --clean           Clean osgi bundle cache
+echo   -c     --clean           Clean OSGi bundle cache
 echo   -v     --verbose         INFO log level
 echo   -vv    --veryverbose     DEBUG log level
 echo   -vvv   --veryveryverbose Trace log level
 echo   -o     --override        Override configurations. USE WITH CAUTION!
 echo   -h     --help            Detailed help.
-echo   -s     --secure          Enable Geronimo for 2 way secure JMX communication.
+echo   -s     --secure          Enable Geronimo for two way secure JMX communication.
 echo.
 echo args for stop command:
 echo   -u     --user            Admin user

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=1066151&r1=1066150&r2=1066151&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
Tue Feb  1 19:19:51 2011
@@ -61,7 +61,6 @@ org.osgi.framework.executionenvironment=
 
 # To enable the use of the startup.properties file to control the start level:
 karaf.auto.start=startup.properties
-#felix.auto.start=all
 
 org.osgi.framework.startlevel.beginning=100
 karaf.startlevel.bundle=60
@@ -73,13 +72,7 @@ karaf.systemBundlesStartLevel=50
 felix.fileinstall.dir    = ${karaf.base}/etc
 felix.fileinstall.filter = .*\\.cfg
 felix.fileinstall.poll   = 1000
-
-#
-# Hack for FELIX-1628
-# As fileinstall does not load the properties into CM soon enough,
-# the Main class does this job asap
-#
-karaf.cm.dir=${karaf.base}/etc
+felix.fileinstall.noInitialDelay = true
 
 #
 # Java platform package export properties.
@@ -228,5 +221,13 @@ jre-1.6=, \
  org.xml.sax.ext, \
  org.xml.sax.helpers
 
+#
 # Equinox: Disable bundle file number limit
+#
 osgi.bundlefile.limit=0
+
+#
+# Equinox: Delay for writing the framework state to disk.
+# Must be  >= 1000 and <= 1800000
+#
+eclipse.stateSaveDelayInterval = 1000



Mime
View raw message