From 15a4f4dd4fee92b90d494e55761a3e9c142a70ef Mon Sep 17 00:00:00 2001 From: sinthuja Date: Thu, 10 Nov 2016 21:21:48 +0530 Subject: [PATCH] Fixing some issues in the broker distribution, and the analytics distribution. --- .../distribution/src/assembly/bin.xml | 4 + .../distribution/src/bin/wso2server.bat | 2 +- .../distribution/src/bin/wso2server.sh | 4 + .../src/repository/conf/etc/jwt.properties | 57 +++++++ .../distribution/src/main/assembly/bin.xml | 141 +++++------------- .../core/distribution/src/assembly/bin.xml | 108 -------------- .../src/resources/bin/start-all.sh | 4 +- 7 files changed, 106 insertions(+), 214 deletions(-) create mode 100644 modules/analytics/distribution/src/repository/conf/etc/jwt.properties diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules/analytics/distribution/src/assembly/bin.xml index 54af562a..b2b13d93 100644 --- a/modules/analytics/distribution/src/assembly/bin.xml +++ b/modules/analytics/distribution/src/assembly/bin.xml @@ -701,6 +701,10 @@ src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties ${pom.artifactId}-${pom.version}/repository/conf/security + + src/repository/conf/etc/jwt.properties + ${pom.artifactId}-${pom.version}/repository/conf/etc + diff --git a/modules/analytics/distribution/src/bin/wso2server.bat b/modules/analytics/distribution/src/bin/wso2server.bat index c11340a5..999592c2 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 -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.core.host="localhost" -Diot.core.https.port="9443" -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 1033e7e2..c99980c3 100755 --- a/modules/analytics/distribution/src/bin/wso2server.sh +++ b/modules/analytics/distribution/src/bin/wso2server.sh @@ -322,6 +322,10 @@ do -Dfile.encoding=UTF8 \ -Djava.net.preferIPv4Stack=true \ -Dcom.ibm.cacheLocalHost=true \ + -Dmqtt.broker.host="localhost" \ + -Dmqtt.broker.port="1886" \ + -Diot.core.host="localhost" \ + -Diot.core.https.port="9443" \ $NODE_PARAMS \ org.wso2.carbon.bootstrap.Bootstrap $* status=$? diff --git a/modules/analytics/distribution/src/repository/conf/etc/jwt.properties b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties new file mode 100644 index 00000000..40548373 --- /dev/null +++ b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties @@ -0,0 +1,57 @@ +# +# Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +# +# WSO2 Inc. 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. +# + +#issuer of the JWT +iss=CDMF_DEFAULT_IDP + +TokenEndpoint=https://localhost:${iot.core.https.port}/oauth2/token + +#audience of JWT claim +#comma seperated values +aud=JwtIdentityAudience + +#expiration time of JWT (number of minutes from the current time) +exp=1000 + +#issued at time of JWT (number of minutes from the current time) +iat=0 + +#nbf time of JWT (number of minutes from current time) +nbf=0 + +#skew between IDP and issuer(seconds) +skew=0 + +# JWT Id +#jti=token123 + +#KeyStore to cryptographic credentials +#KeyStore=repository/resources/security/wso2carbon.jks + +#Password of the KeyStore +#KeyStorePassword=wso2carbon + +#Alias of the SP's private key +#PrivateKeyAlias=wso2carbon + +#Private key password to retrieve the private key used to sign +#AuthnRequest and LogoutRequest messages +#PrivateKeyPassword=wso2carbon + +#this will be used as the default IDP config if there isn't any config available for tenants. +default-jwt-client=true diff --git a/modules/broker/distribution/src/main/assembly/bin.xml b/modules/broker/distribution/src/main/assembly/bin.xml index e0bd0e5d..b76a5117 100644 --- a/modules/broker/distribution/src/main/assembly/bin.xml +++ b/modules/broker/distribution/src/main/assembly/bin.xml @@ -38,7 +38,7 @@ **/carbon.xml **/master-datasources.xml **/release-notes.html - **/repository/conf/axis2/axis2.xml + **/repository/conf/** @@ -47,6 +47,17 @@ **/wso2server.sh **/wso2server.bat + **/broker.xml + **/axis2.xml + **/carbon.xml + **/cipher-text.properties + **/cipher-tool.properties + **/hazelcast.properties + **/master-datasources.xml + **/messaging-event-broker.xml + **/metrics.xml + **/launch.ini + **/log4j.properties **/*.sh @@ -197,36 +208,19 @@ wso2iot-broker-${pom.version}/repository/conf - - **/broker.xml - - 644 - - - - - ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/ - - wso2iot-broker-${pom.version}/repository/conf/advanced - - **/qpid-config.xml - **/qpid-virtualhosts.xml - **/qpid-jmxremote.access - - 644 - - - - - ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ - - wso2iot-broker-${pom.version}/repository/conf/multitenancy - - **/stratos.xml - **/multitenancy-packages.xml - **/usage-throttling-agent-config.xml - **/cloud-services-desc.xml - + + **/broker.xml + **/axis2.xml + **/carbon.xml + **/cipher-text.properties + **/cipher-tool.properties + **/hazelcast.properties + **/master-datasources.xml + **/messaging-event-broker.xml + **/metrics.xml + **/launch.ini + **/log4j.properties + 644 @@ -281,14 +275,6 @@ 644 775 - - src/main/conf - - wso2iot-broker-${pom.version}/repository/conf - - **/broker.xml - - @@ -333,17 +319,24 @@ true 644 - src/main/conf/carbon.xml ${pom.artifactId}-${pom.version}/repository/conf/ true + + src/main/conf/metrics.xml + + ${pom.artifactId}-${pom.version}/repository/conf/ + true + + + src/main/conf/broker.xml + + ${pom.artifactId}-${pom.version}/repository/conf/ + true + src/main/conf/messaging-event-broker.xml wso2iot-broker-${pom.version}/repository/conf @@ -416,45 +409,6 @@ true 644 - - - ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml - - wso2iot-broker-${pom.version}/repository/conf/etc/ - 644 - - - - - - ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.properties - wso2iot-broker-${pom.version}/repository/conf/ - false - 644 - - - src/main/conf/metrics.xml - wso2iot-broker-${pom.version}/repository/conf/ - false - 644 - - - ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/metrics-datasources.xml - ${pom.artifactId}-${pom.version}/repository/conf/datasources/ - 644 - ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2METRICS_DB.h2.db ${pom.artifactId}-${pom.version}/repository/database/ @@ -488,26 +442,5 @@ ${pom.artifactId}-${pom.version}/lib 644 - - - ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity.xml - ${pom.artifactId}-${pom.version}/repository/conf/identity - 644 - - - - ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-agent-config.xml - - ${pom.artifactId}-${pom.version}/repository/conf/data-bridge - true - 644 - - - - src/main/conf/broker.xml - - wso2iot-broker-${pom.version}/repository/conf - 644 - diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml index 4081713c..5ce94fe8 100644 --- a/modules/core/distribution/src/assembly/bin.xml +++ b/modules/core/distribution/src/assembly/bin.xml @@ -685,73 +685,6 @@ true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -782,34 +715,6 @@ ${pom.artifactId}-${pom.version}/bin 755 - - - - - - - - - - - - - - - - - - - - - - - - - - - - src/repository/jaggeryapps/portal/configs/designer.json @@ -906,14 +811,6 @@ true 644 - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml @@ -1045,11 +942,6 @@ ${pom.artifactId}-${pom.version}/repository/database/ 644 - diff --git a/modules/distribution/src/resources/bin/start-all.sh b/modules/distribution/src/resources/bin/start-all.sh index efa57488..3926f8bf 100644 --- a/modules/distribution/src/resources/bin/start-all.sh +++ b/modules/distribution/src/resources/bin/start-all.sh @@ -34,9 +34,11 @@ PRGDIR=`dirname "$PRG"` # Only set CARBON_HOME if not already set [ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd` +sh "$CARBON_HOME/broker/bin/wso2server.sh" $* & +sleep 10 sh "$CARBON_HOME/core/bin/wso2server.sh" $* & +sleep 20 sh "$CARBON_HOME/analytics/bin/wso2server.sh" $* & -sh "$CARBON_HOME/broker/bin/wso2server.sh" $* & if [ ! -z "$*" ]; then exit;