From 6ddc2da328b1974cc131ef47b904e244eb22d1e1 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Thu, 27 Apr 2017 12:47:32 +0530 Subject: [PATCH] Adding fixes related to ease distributed setup. --- modules/distribution/src/assembly/bin.xml | 8 ++++++++ modules/distribution/src/core/bin/iot-server.bat | 2 +- modules/distribution/src/core/bin/iot-server.sh | 2 ++ modules/distribution/src/core/conf/api-manager.xml | 12 ++++++------ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 3cf301e7..f2656c6e 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -946,6 +946,7 @@ **/README.txt **/LICENSE.txt **/release-notes.html + **/dbscripts @@ -1037,6 +1038,13 @@ ${pom.artifactId}-${pom.version}/wso2/broker/resources + + + ../p2-profile/broker-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts + + ${pom.artifactId}-${pom.version}/wso2/broker/dbscripts + + src/broker/bin ${pom.artifactId}-${pom.version}/wso2/broker/bin/ diff --git a/modules/distribution/src/core/bin/iot-server.bat b/modules/distribution/src/core/bin/iot-server.bat index d8aaaa7e..a6371daf 100644 --- a/modules/distribution/src/core/bin/iot-server.bat +++ b/modules/distribution/src/core/bin/iot-server.bat @@ -166,7 +166,7 @@ set CARBON_CLASSPATH=.\lib;%CARBON_CLASSPATH% set JAVA_ENDORSED=".\wso2\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" -Dlogger.server.name="IoT-Core" -Dcatalina.base="%CARBON_HOME%\wso2\lib\tomcat" -Djava.util.logging.config.file="%CARBON_HOME%\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcomponents.repo="%CARBON_HOME%\wso2\components\plugins" -Dcarbon.config.dir.path="%CARBON_HOME%\conf" -Dcarbon.components.dir.path="%CARBON_HOME%\wso2\components" -Dcarbon.extensions.dir.path="%CARBON_HOME%\extensions" -Dcarbon.dropins.dir.path="%CARBON_HOME%\dropins" -Dcarbon.external.lib.dir.path="%CARBON_HOME%\lib" -Dcarbon.patches.dir.path="%CARBON_HOME%\patches" -Dcarbon.servicepacks.dir.path="%CARBON_HOME%\servicepacks" -Dcarbon.internal.lib.dir.path="%CARBON_HOME%\wso2\lib" -Dconf.location="%CARBON_HOME%\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\wso2\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path=true -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -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 -Djava.security.egd=file:/dev/./urandom -Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Dcom.ibm.cacheLocalHost=true -DworkerNode=false -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Diot.manager.host="localhost" -Diot.manager.https.port="9443" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" +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" -Dlogger.server.name="IoT-Core" -Dcatalina.base="%CARBON_HOME%\wso2\lib\tomcat" -Djava.util.logging.config.file="%CARBON_HOME%\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcomponents.repo="%CARBON_HOME%\wso2\components\plugins" -Dcarbon.config.dir.path="%CARBON_HOME%\conf" -Dcarbon.components.dir.path="%CARBON_HOME%\wso2\components" -Dcarbon.extensions.dir.path="%CARBON_HOME%\extensions" -Dcarbon.dropins.dir.path="%CARBON_HOME%\dropins" -Dcarbon.external.lib.dir.path="%CARBON_HOME%\lib" -Dcarbon.patches.dir.path="%CARBON_HOME%\patches" -Dcarbon.servicepacks.dir.path="%CARBON_HOME%\servicepacks" -Dcarbon.internal.lib.dir.path="%CARBON_HOME%\wso2\lib" -Dconf.location="%CARBON_HOME%\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\wso2\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path=true -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -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 -Djava.security.egd=file:/dev/./urandom -Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true -Dcom.ibm.cacheLocalHost=true -DworkerNode=false -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Diot.manager.host="localhost" -Diot.manager.https.port="9443" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.gateway.carbon.https.port="9448" -Diot.gateway.carbon.http.port="9768" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" :runJava echo JAVA_HOME environment variable is set to %JAVA_HOME% echo CARBON_HOME environment variable is set to %CARBON_HOME% diff --git a/modules/distribution/src/core/bin/iot-server.sh b/modules/distribution/src/core/bin/iot-server.sh index d91c09e5..2a122452 100755 --- a/modules/distribution/src/core/bin/iot-server.sh +++ b/modules/distribution/src/core/bin/iot-server.sh @@ -326,6 +326,8 @@ do -Diot.gateway.host="localhost" \ -Diot.gateway.https.port="8243" \ -Diot.gateway.http.port="8280" \ + -Diot.gateway.carbon.https.port="9448" \ + -Diot.gateway.carbon.http.port="9768" \ -Diot.apimpublisher.host="localhost" \ -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ diff --git a/modules/distribution/src/core/conf/api-manager.xml b/modules/distribution/src/core/conf/api-manager.xml index 1341e29f..c5e46cfe 100755 --- a/modules/distribution/src/core/conf/api-manager.xml +++ b/modules/distribution/src/core/conf/api-manager.xml @@ -16,7 +16,7 @@ logic relies on this. --> - https://localhost:${mgt.transport.https.port}${carbon.context}services/ + https://${iot.keymanager.host}:${iot.keymanager.https.port}${carbon.context}services/ ${admin.username} @@ -87,13 +87,13 @@ Production and Sandbox This is a hybrid gateway that handles both production and sandbox token traffic. - https://localhost:${mgt.transport.https.port}${carbon.context}services/ + https://${iot.gateway.host}:${iot.gateway.carbon.https.port}{carbon.context}services/ ${admin.username} ${admin.password} - http://${carbon.local.ip}:${http.nio.port},https://${carbon.local.ip}:${https.nio.port} + http://${iot.gateway.host}:${iot.gateway.http.port},https://${iot.gateway.host}:${iot.gateway.https.port} @@ -202,7 +202,7 @@ --> - https://${carbon.local.ip}:${mgt.transport.https.port}${carbon.context}services/ + https://${iot.keymanager.host}:${iot.keymanager.https.port}${carbon.context}services/ ${admin.username} @@ -228,7 +228,7 @@ 100 50 - org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler @@ -264,7 +264,7 @@ In distributed deployment we should configure this property in key manager node by pointing gateway https( /http, we recommend users to use 'https' endpoints for security purpose) url. Also please note that we should point gateway revoke service to key manager --> - https://localhost:${https.nio.port}/revoke + https://${iot.gateway.host}:${iot.gateway.https.port}/revoke