You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/09/27 10:53:35 UTC
git commit: STRATOS-86: [Stratos Controller] Added jndi.properties
file and updated stratos.sh, stratos.bat
Updated Branches:
refs/heads/master 5c347b199 -> 35701830a
STRATOS-86: [Stratos Controller] Added jndi.properties file and updated stratos.sh, stratos.bat
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/35701830
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/35701830
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/35701830
Branch: refs/heads/master
Commit: 35701830a5897582ff72d62d8f19e833eb011184
Parents: 5c347b1
Author: Imesh Gunaratne <im...@gmail.com>
Authored: Fri Sep 27 14:23:01 2013 +0530
Committer: Imesh Gunaratne <im...@gmail.com>
Committed: Fri Sep 27 14:23:01 2013 +0530
----------------------------------------------------------------------
products/stratos-controller/conf/jndi.properties | 3 +++
.../stratos-controller/modules/distribution/src/bin/stratos.bat | 2 +-
.../stratos-controller/modules/distribution/src/bin/stratos.sh | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/35701830/products/stratos-controller/conf/jndi.properties
----------------------------------------------------------------------
diff --git a/products/stratos-controller/conf/jndi.properties b/products/stratos-controller/conf/jndi.properties
new file mode 100644
index 0000000..d06f327
--- /dev/null
+++ b/products/stratos-controller/conf/jndi.properties
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory
+connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://localhost:5677'&reconnect='true'
+topic.cloud-controller-topology=cloud-controller-topology
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/35701830/products/stratos-controller/modules/distribution/src/bin/stratos.bat
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/distribution/src/bin/stratos.bat b/products/stratos-controller/modules/distribution/src/bin/stratos.bat
index baf58fa..05a8e87 100644
--- a/products/stratos-controller/modules/distribution/src/bin/stratos.bat
+++ b/products/stratos-controller/modules/distribution/src/bin/stratos.bat
@@ -155,7 +155,7 @@ set CARBON_CLASSPATH=.\lib;%CARBON_CLASSPATH%
set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
-set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\log4j.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\
conf" -Dcarbon.logs.path="%CARBON_HOME%\repository\logs" -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dloadbalancer.conf="%CARBON_HOME%\repository\conf\loadbalancer.conf"
+set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\log4j.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\
conf" -Djndi.properties.dir="%CARBON_HOME%/repository/conf" -Dcarbon.logs.path="%CARBON_HOME%\repository\logs" -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dloadbalancer.conf="%CARBON_HOME%\repository\conf\loadbalancer.conf"
:runJava
echo JAVA_HOME environment variable is set to %JAVA_HOME%
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/35701830/products/stratos-controller/modules/distribution/src/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/distribution/src/bin/stratos.sh b/products/stratos-controller/modules/distribution/src/bin/stratos.sh
index a095502..7cb00b5 100755
--- a/products/stratos-controller/modules/distribution/src/bin/stratos.sh
+++ b/products/stratos-controller/modules/distribution/src/bin/stratos.sh
@@ -284,6 +284,7 @@ do
-Dcarbon.config.dir.path="$CARBON_HOME/repository/conf" \
-Dcomponents.repo="$CARBON_HOME/repository/components/plugins" \
-Dconf.location="$CARBON_HOME/repository/conf"\
+ -Djndi.properties.dir="$CARBON_HOME/repository/conf" \
-Dcom.atomikos.icatch.file="$CARBON_HOME/lib/transactions.properties" \
-Dcom.atomikos.icatch.hide_init_file_path=true \
-Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true \