You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/07/19 08:18:56 UTC
git commit: refactor elb shell script references fix conflicts
Updated Branches:
refs/heads/master a7e9e80a3 -> 7921c20ba
refactor elb shell script references fix conflicts
Signed-off-by: Lakmal Warusawithana <la...@wso2.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7921c20b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7921c20b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7921c20b
Branch: refs/heads/master
Commit: 7921c20ba58527287c4c203f8a94ecf11ba53234
Parents: a7e9e80
Author: Imesh Gunaratne <im...@wso2.com>
Authored: Fri Jul 19 11:30:16 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Fri Jul 19 11:48:35 2013 +0530
----------------------------------------------------------------------
products/elb/INSTALL.txt | 10 +++++-----
products/elb/README.txt | 2 +-
products/elb/docs/xdoc/release-notes.xml | 2 +-
.../elb/modules/distribution/src/main/assembly/bin.xml | 12 ++++++------
.../elb/modules/distribution/src/main/bin/wso2server.sh | 8 ++++----
5 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7921c20b/products/elb/INSTALL.txt
----------------------------------------------------------------------
diff --git a/products/elb/INSTALL.txt b/products/elb/INSTALL.txt
index bb020af..de6eb44 100644
--- a/products/elb/INSTALL.txt
+++ b/products/elb/INSTALL.txt
@@ -11,14 +11,14 @@ Standalone Mode
2. All the shell scripts and .bat files are available in CARBON_HOME/bin folder.
-3. To start ELB one can use either wso2server.sh in all Unix
- systems & wso2server.bat file on Windows operating systems.
+3. To start ELB one can use either stratos.sh in all Unix
+ systems & stratos.bat file on Windows operating systems.
4. Either of the following commands can be used to start ELB
- i) ./wso2server.sh {console|start|stop|restart|version}
- ii) wso2server.bat {start|stop|version}
+ i) ./stratos.sh {console|start|stop|restart|version}
+ ii) stratos.bat {start|stop|version}
- Usage: wso2server.sh [command] [options] [system-properties]
+ Usage: stratos.sh [command] [options] [system-properties]
command:
--start Start ELB as a Unix daemon in the background
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7921c20b/products/elb/README.txt
----------------------------------------------------------------------
diff --git a/products/elb/README.txt b/products/elb/README.txt
index 352eccd..e5f3f5d 100755
--- a/products/elb/README.txt
+++ b/products/elb/README.txt
@@ -44,7 +44,7 @@ Installation & Running
==================================
1. Extract the wso2elb-2.0.5.zip and go to the extracted directory
-2. Run the wso2server.sh or wso2server.bat as appropriate
+2. Run the stratos.sh or stratos.bat as appropriate
3. Configure the load balancer to manage the load across the instants to be balanced.
WSO2 ELB 2.0.5 distribution directory structure
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7921c20b/products/elb/docs/xdoc/release-notes.xml
----------------------------------------------------------------------
diff --git a/products/elb/docs/xdoc/release-notes.xml b/products/elb/docs/xdoc/release-notes.xml
index a685c02..a6d3673 100644
--- a/products/elb/docs/xdoc/release-notes.xml
+++ b/products/elb/docs/xdoc/release-notes.xml
@@ -66,7 +66,7 @@
<ol>
<li>Extract the downloaded zip</li>
<li>Go to the bin directory in the extracted folder</li>
- <li>Run the wso2server.sh or wso2server.bat as appropriate</li>
+ <li>Run the stratos.sh or stratos.bat as appropriate</li>
<li>Configure the load balancer to manage the load across the instances to be balanced.</li>
<li>If you need to start the OSGi console with the server use the property
-DosgiConsole when starting the server. The INSTALL.txt file found on the
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7921c20b/products/elb/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/assembly/bin.xml b/products/elb/modules/distribution/src/main/assembly/bin.xml
index 25e44c9..a1d2e77 100755
--- a/products/elb/modules/distribution/src/main/assembly/bin.xml
+++ b/products/elb/modules/distribution/src/main/assembly/bin.xml
@@ -37,7 +37,7 @@
<exclude>**/services/sample01.aar</exclude>
<exclude>**/repository/services/version/**</exclude>
<exclude>**/version.txt</exclude>
- <exclude>**/wso2server.bat</exclude>
+ <exclude>**/stratos.bat</exclude>
<exclude>**/README.txt</exclude>
<exclude>**/LICENSE.txt</exclude>
<exclude>**/INSTALL.txt</exclude>
@@ -152,16 +152,16 @@
<files>
<file>
- <source>src/main/bin/wso2server.sh</source>
+ <source>src/main/bin/stratos.sh</source>
<outputDirectory>apache-stratos-elb-${pom.version}/bin</outputDirectory>
- <destName>wso2server.sh</destName>
+ <destName>stratos.sh</destName>
<fileMode>755</fileMode>
<filtered>true</filtered>
</file>
<file>
- <source>src/main/bin/wso2server.bat</source>
+ <source>src/main/bin/stratos.bat</source>
<outputDirectory>apache-stratos-elb-${pom.version}/bin</outputDirectory>
- <destName>wso2server.bat</destName>
+ <destName>stratos.bat</destName>
<fileMode>755</fileMode>
<filtered>true</filtered>
</file>
@@ -277,7 +277,7 @@
<fileMode>644</fileMode>
</file>
<!--file>
- <source>target/wso2carbon-core-${carbon.patch.version}/bin/wso2server.bat
+ <source>target/wso2carbon-core-${carbon.patch.version}/bin/stratos.bat
</source>
<outputDirectory>apache-stratos-elb-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7921c20b/products/elb/modules/distribution/src/main/bin/wso2server.sh
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/bin/wso2server.sh b/products/elb/modules/distribution/src/main/bin/wso2server.sh
index 253a33f..338b7d4 100644
--- a/products/elb/modules/distribution/src/main/bin/wso2server.sh
+++ b/products/elb/modules/distribution/src/main/bin/wso2server.sh
@@ -184,7 +184,7 @@ elif [ "$CMD" = "--n" ]; then
fi
elif [ "$CMD" = "start" ]; then
export CARBON_HOME=$CARBON_HOME
- nohup $CARBON_HOME/bin/wso2server.sh &
+ nohup $CARBON_HOME/bin/stratos.sh &
exit 0
elif [ "$CMD" = "stop" ]; then
export CARBON_HOME=$CARBON_HOME
@@ -203,7 +203,7 @@ elif [ "$CMD" = "restart" ]; then
done
# using nohup bash to avoid erros in solaris OS.TODO
- nohup bash $CARBON_HOME/bin/wso2server.sh > /dev/null 2>&1 &
+ nohup bash $CARBON_HOME/bin/stratos.sh > /dev/null 2>&1 &
exit 0
elif [ "$CMD" = "test" ]; then
JAVACMD="exec "$JAVACMD""
@@ -272,10 +272,10 @@ exec "$JAVACMD" \
-XX:+CMSClassUnloadingEnabled \
-XX:+OptimizeStringConcat \
-XX:+HeapDumpOnOutOfMemoryError \
- -XX:OnOutOfMemoryError="kill -9 `echo $$`;nohup ./wso2server.sh &" \
+ -XX:OnOutOfMemoryError="kill -9 `echo $$`;nohup ./stratos.sh &" \
-XX:HeapDumpPath=repository/logs/heap-dump.hprof \
-XX:ErrorFile=repository/logs/hs_err_pid.log \
- -XX:OnError="nohup ./wso2server.sh &" \
+ -XX:OnError="nohup ./stratos.sh &" \
$JAVA_OPTS \
-Dcarbon.pid=$$ \
-Dcom.sun.management.jmxremote \