From f7399060e526823b3447f2ea864ce410c2bd734e Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 12 Jan 2017 19:30:17 +0530 Subject: [PATCH] moved the configs to gateway --- modules/analytics/distribution/ds_config.xml | 21 ------------------- .../distribution/output-adapter-change.xml | 4 ++-- modules/analytics/distribution/pom.xml | 1 - .../distribution/src/bin/wso2server.bat | 2 +- .../distribution/src/bin/wso2server.sh | 2 -- .../distribution/src/main/conf/broker.xml | 2 +- .../distribution/output-adapter-change.xml | 4 ++-- modules/distribution/src/assembly/dist.xml | 16 +++++++------- 8 files changed, 14 insertions(+), 38 deletions(-) diff --git a/modules/analytics/distribution/ds_config.xml b/modules/analytics/distribution/ds_config.xml index c1d5903e..08649d4b 100644 --- a/modules/analytics/distribution/ds_config.xml +++ b/modules/analytics/distribution/ds_config.xml @@ -6,27 +6,6 @@ jdbc/WSO2CarbonDB - - - jdbc:h2:./repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - false - - - - - WSO2_UM_DB - The datasource used for registry and user manager - - jdbc/WSO2UMDB - jdbc:h2:../core/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9095 diff --git a/modules/analytics/distribution/output-adapter-change.xml b/modules/analytics/distribution/output-adapter-change.xml index 3a824330..1b0f31b0 100644 --- a/modules/analytics/distribution/output-adapter-change.xml +++ b/modules/analytics/distribution/output-adapter-change.xml @@ -27,10 +27,10 @@ 100 org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.DeviceAuthorizer https://${iot.gateway.host}:${iot.gateway.https.port}/token - https://${iot.core.host}:${iot.core.https.port} + https://${iot.gateway.host}:${iot.gateway.https.port} admin admin - + perm:authorization:verify /permission/device-mgt/realtime_analytics diff --git a/modules/analytics/distribution/pom.xml b/modules/analytics/distribution/pom.xml index 6b4d246c..417b209b 100644 --- a/modules/analytics/distribution/pom.xml +++ b/modules/analytics/distribution/pom.xml @@ -176,7 +176,6 @@ - diff --git a/modules/analytics/distribution/src/bin/wso2server.bat b/modules/analytics/distribution/src/bin/wso2server.bat index 7f227e68..60a12126 100644 --- a/modules/analytics/distribution/src/bin/wso2server.bat +++ b/modules/analytics/distribution/src/bin/wso2server.bat @@ -196,7 +196,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%" -Dlogger.server.name="IoT-Analytics" -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\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf" -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.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -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.gatway.host="localhost" -Diot.gateway.https.port="8243" -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 +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%" -Dlogger.server.name="IoT-Analytics" -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\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf" -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.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gatway.host="localhost" -Diot.gateway.https.port="8243" -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 :runJava echo JAVA_HOME environment variable is set to %JAVA_HOME% diff --git a/modules/analytics/distribution/src/bin/wso2server.sh b/modules/analytics/distribution/src/bin/wso2server.sh index 29029c30..1315b4f2 100755 --- a/modules/analytics/distribution/src/bin/wso2server.sh +++ b/modules/analytics/distribution/src/bin/wso2server.sh @@ -324,8 +324,6 @@ do -Dcom.ibm.cacheLocalHost=true \ -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" \ diff --git a/modules/broker/distribution/src/main/conf/broker.xml b/modules/broker/distribution/src/main/conf/broker.xml index ade1fa3e..87ee1cb5 100755 --- a/modules/broker/distribution/src/main/conf/broker.xml +++ b/modules/broker/distribution/src/main/conf/broker.xml @@ -188,7 +188,7 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c https://localhost:9443/oauth2 100 - https://localhost:9443 + https://localhost:8243 diff --git a/modules/core/distribution/output-adapter-change.xml b/modules/core/distribution/output-adapter-change.xml index 3a824330..1b0f31b0 100644 --- a/modules/core/distribution/output-adapter-change.xml +++ b/modules/core/distribution/output-adapter-change.xml @@ -27,10 +27,10 @@ 100 org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.DeviceAuthorizer https://${iot.gateway.host}:${iot.gateway.https.port}/token - https://${iot.core.host}:${iot.core.https.port} + https://${iot.gateway.host}:${iot.gateway.https.port} admin admin - + perm:authorization:verify /permission/device-mgt/realtime_analytics diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml index 0fe2797a..ad2b2fb7 100644 --- a/modules/distribution/src/assembly/dist.xml +++ b/modules/distribution/src/assembly/dist.xml @@ -45,14 +45,14 @@ */** - - src/resources/bin - wso2iot-${product.iot.version}/bin - - */** - - 755 - + + + + + + + + src/resources/plugins wso2iot-${product.iot.version}/plugins