You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2011/07/13 09:22:24 UTC
svn commit: r1145890 -
/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/Main.java
Author: cziegeler
Date: Wed Jul 13 07:22:23 2011
New Revision: 1145890
URL: http://svn.apache.org/viewvc?rev=1145890&view=rev
Log:
Prefix "Sling" properly with "Apache"
Modified:
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/Main.java
Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/Main.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/Main.java?rev=1145890&r1=1145889&r2=1145890&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/Main.java (original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/Main.java Wed Jul 13 07:22:23 2011
@@ -67,7 +67,7 @@ public class Main extends Thread impleme
private Main(String[] args) {
// set the thread name
- super("Sling Terminator");
+ super("Apache Sling Terminator");
this.commandLineArgs = parseCommandLine(args);
@@ -81,9 +81,9 @@ public class Main extends Thread impleme
this.slingHome = getSlingHome(commandLineArgs);
File slingHomeFile = new File(slingHome);
if (slingHomeFile.isAbsolute()) {
- info("Starting Sling in " + slingHome, null);
+ info("Starting Apache Sling in " + slingHome, null);
} else {
- info("Starting Sling in " + slingHome + " ("
+ info("Starting Apache Sling in " + slingHome + " ("
+ slingHomeFile.getAbsolutePath() + ")", null);
}
@@ -122,7 +122,7 @@ public class Main extends Thread impleme
// now really shutdown sling
if (sling != null) {
- info("Stopping Sling", null);
+ info("Stopping Apache Sling", null);
sling.stop();
}
}
@@ -143,7 +143,7 @@ public class Main extends Thread impleme
* removed and remove the shutdown hook (but don't care if that fails).
*/
- info("Sling has been stopped", null);
+ info("Apache Sling has been stopped", null);
// clear the reference to the framework
sling = null;
@@ -179,7 +179,7 @@ public class Main extends Thread impleme
if (updateFile == null) {
- info("Restarting Framework and Sling", null);
+ info("Restarting Framework and Apache Sling", null);
startSling(null);
} else {
@@ -245,7 +245,7 @@ public class Main extends Thread impleme
info("Startup completed", null);
this.sling = sling;
} else {
- error("There was a problem launching Sling", null);
+ error("There was a problem launching Apache Sling", null);
}
}
}
@@ -410,8 +410,8 @@ public class Main extends Thread impleme
+ " [ start | stop | status ] [ -j adr ] [ -l loglevel ] [ -f logfile ] [ -c slinghome ] [ -a address ] [ -p port ] [ -h ]");
System.out.println(" start listen for control connection (uses -j)");
- System.out.println(" stop terminate running Sling (uses -j)");
- System.out.println(" status check whether Sling is running (uses -j)");
+ System.out.println(" stop terminate running Apache Sling (uses -j)");
+ System.out.println(" status check whether Apache Sling is running (uses -j)");
System.out.println(" -j adr host and port to use for control connection in the format '[host:]port' (default localhost:63000)");
System.out.println(" -l loglevel the initial loglevel (0..4, FATAL, ERROR, WARN, INFO, DEBUG)");
System.out.println(" -f logfile the log file, \"-\" for stdout (default logs/error.log)");