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 2015/05/17 09:34:41 UTC
stratos git commit: Adding thrift-client-config.xml file to stratos
load balancer and fixing thrift port
Repository: stratos
Updated Branches:
refs/heads/master c1a08e9bd -> 66e42caad
Adding thrift-client-config.xml file to stratos load balancer and fixing thrift port
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/66e42caa
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/66e42caa
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/66e42caa
Branch: refs/heads/master
Commit: 66e42caad49bba5739c291fbce75b07220ea1673
Parents: c1a08e9
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun May 17 13:04:25 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun May 17 13:04:25 2015 +0530
----------------------------------------------------------------------
.../publisher/wso2/cep/ThriftClientConfig.java | 6 ++
.../src/test/resources/thrift-client-config.xml | 29 ++++----
.../src/main/conf/thrift-client-config.xml | 4 +-
.../src/main/conf/thrift-client-config.xml | 4 +-
.../src/main/conf/thrift-client-config.xml | 30 ++++----
.../distribution/src/main/assembly/bin.xml | 75 +++++++-------------
.../distribution/src/main/bin/stratos.bat | 2 +-
.../distribution/src/main/bin/stratos.sh | 1 +
.../src/main/conf/thrift-client-config.xml | 27 +++++++
products/stratos/conf/thrift-client-config.xml | 4 +-
10 files changed, 102 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/66e42caa/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java
index 18232d6..4879b02 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/ThriftClientConfig.java
@@ -20,6 +20,8 @@
package org.apache.stratos.common.statistics.publisher.wso2.cep;
+import org.apache.commons.lang.StringUtils;
+
/**
* Thrift Client configuration.
*/
@@ -42,6 +44,10 @@ public class ThriftClientConfig {
synchronized (ThriftClientConfig.class) {
if (instance == null) {
String configFilePath = System.getProperty(THRIFT_CLIENT_CONFIG_FILE_PATH);
+ if(StringUtils.isBlank(configFilePath)) {
+ throw new RuntimeException(String.format("Thrift client configuration file path system " +
+ "property is not set: %s", THRIFT_CLIENT_CONFIG_FILE_PATH));
+ }
instance = ThriftClientConfigParser.parse(configFilePath);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/66e42caa/components/org.apache.stratos.common/src/test/resources/thrift-client-config.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/test/resources/thrift-client-config.xml b/components/org.apache.stratos.common/src/test/resources/thrift-client-config.xml
index 6e0e303..7e9ff39 100644
--- a/components/org.apache.stratos.common/src/test/resources/thrift-client-config.xml
+++ b/components/org.apache.stratos.common/src/test/resources/thrift-client-config.xml
@@ -1,21 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2005-2011 WSO2, Inc. (http://wso2.com)
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
-->
-<!--Fields to be read and parsed into WSO2CEPStatisticsPublisher-->
-<!--Test configuration file-->
+<!-- Apache thrift client configuration for publishing statistics to WSO2 CEP -->
<thriftClientConfiguration>
<username>admin</username>
<password>1234</password>
http://git-wip-us.apache.org/repos/asf/stratos/blob/66e42caa/extensions/load-balancer/haproxy-extension/src/main/conf/thrift-client-config.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/src/main/conf/thrift-client-config.xml b/extensions/load-balancer/haproxy-extension/src/main/conf/thrift-client-config.xml
index 86a5fc6..5cacada 100644
--- a/extensions/load-balancer/haproxy-extension/src/main/conf/thrift-client-config.xml
+++ b/extensions/load-balancer/haproxy-extension/src/main/conf/thrift-client-config.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -7,7 +8,7 @@
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
@@ -17,6 +18,7 @@
~ under the License.
-->
+<!-- Apache thrift client configuration for publishing statistics to WSO2 CEP -->
<thriftClientConfiguration>
<username>admin</username>
<password>admin</password>
http://git-wip-us.apache.org/repos/asf/stratos/blob/66e42caa/extensions/load-balancer/nginx-extension/src/main/conf/thrift-client-config.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/nginx-extension/src/main/conf/thrift-client-config.xml b/extensions/load-balancer/nginx-extension/src/main/conf/thrift-client-config.xml
index 86a5fc6..5cacada 100644
--- a/extensions/load-balancer/nginx-extension/src/main/conf/thrift-client-config.xml
+++ b/extensions/load-balancer/nginx-extension/src/main/conf/thrift-client-config.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -7,7 +8,7 @@
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
@@ -17,6 +18,7 @@
~ under the License.
-->
+<!-- Apache thrift client configuration for publishing statistics to WSO2 CEP -->
<thriftClientConfiguration>
<username>admin</username>
<password>admin</password>
http://git-wip-us.apache.org/repos/asf/stratos/blob/66e42caa/products/cartridge-agent/modules/distribution/src/main/conf/thrift-client-config.xml
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/conf/thrift-client-config.xml b/products/cartridge-agent/modules/distribution/src/main/conf/thrift-client-config.xml
index 092f4bf..5cacada 100644
--- a/products/cartridge-agent/modules/distribution/src/main/conf/thrift-client-config.xml
+++ b/products/cartridge-agent/modules/distribution/src/main/conf/thrift-client-config.xml
@@ -1,23 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2005-2011 WSO2, Inc. (http://wso2.com)
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
-->
-<!--Fields to be read and parsed into WSO2CEPStatisticsPublisher-->
+<!-- Apache thrift client configuration for publishing statistics to WSO2 CEP -->
<thriftClientConfiguration>
<username>admin</username>
<password>admin</password>
<ip>localhost</ip>
- <port>7711</port>
+ <port>7611</port>
</thriftClientConfiguration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/66e42caa/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
index b5086b0..6812cec 100755
--- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
+++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
@@ -75,11 +75,11 @@
<exclude>**/.data</exclude>
<exclude>**/.settings</exclude>
<exclude>**/synapse-samples*</exclude>
- <exclude>**/plugins/*.ui*</exclude>
- <exclude>**/plugins/infinispan-core_5.1.2.wso2v1.jar</exclude>
- <exclude>**/plugins/jboss-logging_3.1.0.wso2v1.jar</exclude>
- <exclude>**/plugins/jgroups_3.0.6.wso2v1.jar</exclude>
- <exclude>**/plugins/marshalling_1.3.6.wso2v1.jar</exclude>
+ <exclude>**/plugins/*.ui*</exclude>
+ <exclude>**/plugins/infinispan-core_5.1.2.wso2v1.jar</exclude>
+ <exclude>**/plugins/jboss-logging_3.1.0.wso2v1.jar</exclude>
+ <exclude>**/plugins/jgroups_3.0.6.wso2v1.jar</exclude>
+ <exclude>**/plugins/marshalling_1.3.6.wso2v1.jar</exclude>
</excludes>
</fileSet>
<!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 -->
@@ -97,11 +97,13 @@
</fileSet>
<fileSet>
<directory>src/main/cartridges</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/deployment/server/cartridges</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/deployment/server/cartridges
+ </outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/services</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/deployment/server/services</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/deployment/server/services
+ </outputDirectory>
</fileSet>
<fileSet>
<directory>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/</directory>
@@ -178,28 +180,6 @@
<include>org.wso2.carbon:org.wso2.carbon.mediator.bridge:jar</include>
</includes>
</dependencySet>
- <!--dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/samples/axis2Client/client_repo/modules
- </outputDirectory>
- <includes>
- <include>org.apache.axis2:addressing:mar</include>
- <include>org.apache.rampart:rampart:mar</include>
- <include>org.apache.sandesha2:sandesha2:mar</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
- </outputFileNameMapping>
- </dependencySet>
- <dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/samples/axis2Server/repository/modules
- </outputDirectory>
- <includes>
- <include>org.apache.axis2:addressing:mar</include>
- <include>org.apache.rampart:rampart:mar</include>
- <include>org.apache.sandesha2:sandesha2:mar</include>
- </includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
- </outputFileNameMapping>
- </dependencySet-->
<dependencySet>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/axis2/client/lib</outputDirectory>
<includes>
@@ -225,15 +205,15 @@
<include>org.wso2.carbon:org.wso2.carbon.event.client:jar</include-->
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/lib</outputDirectory>
+ <dependencySet>
+ <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/lib</outputDirectory>
<includes>
<include>org.apache.activemq:activemq-client:jar</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:jar</include>
<include>org.fusesource.hawtbuf:hawtbuf:jar</include>
- <include>org.eclipse.paho:mqtt-client:jar</include>
- </includes>
- </dependencySet>
+ <include>org.eclipse.paho:mqtt-client:jar</include>
+ </includes>
+ </dependencySet>
</dependencySets>
<files>
@@ -257,19 +237,6 @@
</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
</file>
- <!--file>
- <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/zoo.cfg</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/etc</outputDirectory>
- </file>
- <file>
- <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/coordination-client-config.xml</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/etc</outputDirectory>
- </file-->
- <!--<file>
- <source>src/main/conf/user-mgt.xml</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
- <destName>user-mgt.xml</destName>
- </file> -->
<file>
<source>src/main/conf/embedded-ldap.xml</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
@@ -326,6 +293,12 @@
<filtered>true</filtered>
</file>
<file>
+ <source>src/main/conf/thrift-client-config.xml</source>
+ <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <destName>thrift-client-config.xml</destName>
+ <filtered>true</filtered>
+ </file>
+ <file>
<source>src/main/license/LICENSE</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}</outputDirectory>
<filtered>true</filtered>
@@ -368,7 +341,7 @@
<filtered>true</filtered>
</file-->
- <!--Copying config files from kernel patches -->
+ <!--Copying config files from kernel patches -->
<file>
<source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source>
@@ -392,12 +365,14 @@
<filtered>true</filtered>
</file>-->
<file>
- <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties</source>
+ <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties
+ </source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered>
</file>
<file>
- <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties</source>
+ <source>../p2-profile/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties
+ </source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered>
</file>
http://git-wip-us.apache.org/repos/asf/stratos/blob/66e42caa/products/load-balancer/modules/distribution/src/main/bin/stratos.bat
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/bin/stratos.bat b/products/load-balancer/modules/distribution/src/main/bin/stratos.bat
index 6435a0d..0cc7934 100644
--- a/products/load-balancer/modules/distribution/src/main/bin/stratos.bat
+++ b/products/load-balancer/modules/distribution/src/main/bin/stratos.bat
@@ -154,7 +154,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% -Xms1500m -Xmx3000m -XX:PermSize=256m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:-UseGCOverheadLimit -XX:+CMSClassUnloadingEnabled -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%" -Dloadbalancer.conf.file="%CARBON_HOME%\repository\conf\loadbalancer.conf" -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" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\log4j.properties" -Dca
rbon.config.dir.path="%CARBON_HOME%\repository\conf" -Djndi.properties.dir="%CARBON_HOME%/repository/conf" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcarbon.logs.path="%CARBON_HOME%\repository\logs" -Dcomponents.repo="%CARBON_HOME%\repository\components" -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 -Djavax.net.ssl.trustStore=$CARBON_HOME/repository/resources/security/client-truststore.jks -Djavax.net.ssl.trustStorePassword=wso2carbon -Dwso2.loadbalancer=true
+set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms1500m -Xmx3000m -XX:PermSize=256m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:-UseGCOverheadLimit -XX:+CMSClassUnloadingEnabled -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%" -Dloadbalancer.conf.file="%CARBON_HOME%\repository\conf\loadbalancer.conf" -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" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\log4j.properties" -Dca
rbon.config.dir.path="%CARBON_HOME%\repository\conf" -Djndi.properties.dir="%CARBON_HOME%/repository/conf" -Dthrift.client.config.file.path="$CARBON_HOME/repository/conf/thrift-cliet-config.xml" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcarbon.logs.path="%CARBON_HOME%\repository\logs" -Dcomponents.repo="%CARBON_HOME%\repository\components" -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 -Djavax.net.ssl.trustStore=$CARBON_HOME/repository/resources/security/client-truststore.jks -Djavax.net.ssl.trustStorePassword=wso2carbon -Dwso2.loadbalancer=true
:runJava
echo JAVA_HOME environment variable is set to %JAVA_HOME%
http://git-wip-us.apache.org/repos/asf/stratos/blob/66e42caa/products/load-balancer/modules/distribution/src/main/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/bin/stratos.sh b/products/load-balancer/modules/distribution/src/main/bin/stratos.sh
index 1a2c3f8..9a912c0 100644
--- a/products/load-balancer/modules/distribution/src/main/bin/stratos.sh
+++ b/products/load-balancer/modules/distribution/src/main/bin/stratos.sh
@@ -300,6 +300,7 @@ do
-Djava.security.egd=file:/dev/./urandom \
-Dfile.encoding=UTF8 \
-Djndi.properties.dir="$CARBON_HOME/repository/conf" \
+ -Dthrift.client.config.file.path="$CARBON_HOME/repository/conf/thrift-client-config.xml" \
-Dwso2.loadbalancer=true \
org.wso2.carbon.bootstrap.Bootstrap $*
status=$?
http://git-wip-us.apache.org/repos/asf/stratos/blob/66e42caa/products/load-balancer/modules/distribution/src/main/conf/thrift-client-config.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/conf/thrift-client-config.xml b/products/load-balancer/modules/distribution/src/main/conf/thrift-client-config.xml
new file mode 100644
index 0000000..55efb6d
--- /dev/null
+++ b/products/load-balancer/modules/distribution/src/main/conf/thrift-client-config.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<!-- Apache thrift client configuration for publishing statistics to WSO2 CEP -->
+<thriftClientConfiguration>
+ <username>admin</username>
+ <password>admin</password>
+ <ip>localhost</ip>
+ <port>7711</port>
+</thriftClientConfiguration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/66e42caa/products/stratos/conf/thrift-client-config.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/thrift-client-config.xml b/products/stratos/conf/thrift-client-config.xml
index 86a5fc6..5cacada 100644
--- a/products/stratos/conf/thrift-client-config.xml
+++ b/products/stratos/conf/thrift-client-config.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -7,7 +8,7 @@
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
@@ -17,6 +18,7 @@
~ under the License.
-->
+<!-- Apache thrift client configuration for publishing statistics to WSO2 CEP -->
<thriftClientConfiguration>
<username>admin</username>
<password>admin</password>