From 70c4b9a24a94fdc8b35a62ce0942e0b13def74e4 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Mon, 17 Apr 2017 10:30:36 +0530 Subject: [PATCH 1/7] Removing some unwanted scripts from profiles. --- .../distribution/src/analytics/bin/build.xml | 266 +++++++ modules/distribution/src/assembly/bin.xml | 190 ++--- modules/distribution/src/broker/bin/build.xml | 266 +++++++ modules/distribution/src/core/bin/build.xml | 266 +++++++ .../distribution/src/core/bin/carbondump.bat | 198 +++++ .../distribution/src/core/bin/carbondump.sh | 238 ++++++ .../distribution/src/core/bin/chpasswd.bat | 76 ++ modules/distribution/src/core/bin/chpasswd.sh | 116 +++ .../distribution/src/core/bin/ciphertool.bat | 89 +++ .../distribution/src/core/bin/ciphertool.sh | 127 ++++ .../src/core/bin/profile-creator.sh | 15 +- .../src/core/plugins/plugins-deployer.xml | 2 +- .../resources/profiles/backend/carbon.xml | 688 ++++++++++++++++++ .../resources/profiles/backend/iot-server.bat | 2 +- .../resources/profiles/backend/iot-server.sh | 8 +- .../resources/profiles/gateway/carbon.xml | 688 ++++++++++++++++++ .../resources/profiles/gateway/iot-server.bat | 2 +- .../resources/profiles/gateway/iot-server.sh | 8 +- .../resources/profiles/keymanager/carbon.xml | 688 ++++++++++++++++++ .../profiles/keymanager/iot-server.bat | 2 +- .../profiles/keymanager/iot-server.sh | 8 +- .../resources/profiles/manager/carbon.xml | 688 ++++++++++++++++++ .../resources/profiles/manager/iot-server.bat | 2 +- .../resources/profiles/manager/iot-server.sh | 8 +- modules/p2-profile/iot-core-profile/pom.xml | 36 - 25 files changed, 4499 insertions(+), 178 deletions(-) create mode 100644 modules/distribution/src/analytics/bin/build.xml create mode 100644 modules/distribution/src/broker/bin/build.xml create mode 100644 modules/distribution/src/core/bin/build.xml create mode 100644 modules/distribution/src/core/bin/carbondump.bat create mode 100755 modules/distribution/src/core/bin/carbondump.sh create mode 100644 modules/distribution/src/core/bin/chpasswd.bat create mode 100755 modules/distribution/src/core/bin/chpasswd.sh create mode 100644 modules/distribution/src/core/bin/ciphertool.bat create mode 100755 modules/distribution/src/core/bin/ciphertool.sh create mode 100644 modules/distribution/src/core/resources/profiles/backend/carbon.xml create mode 100644 modules/distribution/src/core/resources/profiles/gateway/carbon.xml create mode 100644 modules/distribution/src/core/resources/profiles/keymanager/carbon.xml create mode 100644 modules/distribution/src/core/resources/profiles/manager/carbon.xml diff --git a/modules/distribution/src/analytics/bin/build.xml b/modules/distribution/src/analytics/bin/build.xml new file mode 100644 index 00000000..9256e7d9 --- /dev/null +++ b/modules/distribution/src/analytics/bin/build.xml @@ -0,0 +1,266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Removing UI related jars located in : ${carbon.home}/repository/components/plugins + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 71ddab4b..14db14af 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -260,8 +260,29 @@ */** + true + + + + src/core/bin/ + ${pom.artifactId}-${pom.version}/bin + + **/*.sh + **/*.bat + + 755 + + src/core/bin/ + ${pom.artifactId}-${pom.version}/bin + + **/*.sh + **/*.bat + + + + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/ @@ -737,10 +758,12 @@ ${pom.artifactId}-${pom.version}/wso2/analytics/bin - **/wso2server.sh - **/wso2server.bat - **/load-spark-env-vars.sh - **/load-spark-env-vars.bat + **/wso2server* + **/load-spark-env-vars* + **/java2wsdl* + **/tcpmon* + **/wsdl2java* + **/build.xml @@ -863,6 +886,27 @@ ${pom.artifactId}-${pom.version}/wso2/analytics/resources/allthemes + + src/analytics/bin + ${pom.artifactId}-${pom.version}/wso2/analytics/bin/ + + **/*.sh + **/*.bat + + true + 755 + + + + src/analytics/bin + ${pom.artifactId}-${pom.version}/wso2/analytics/bin/ + + **/*.sh + **/*.bat + + true + + ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/components @@ -962,8 +1006,10 @@ ${pom.artifactId}-${pom.version}/wso2/broker/bin - **/wso2server.sh - **/wso2server.bat + **/wso2server* + **/java2wsdl* + **/tcpmon* + **/wsdl2java* @@ -991,7 +1037,27 @@ ${pom.artifactId}-${pom.version}/wso2/broker/resources - + + + src/broker/bin + ${pom.artifactId}-${pom.version}/wso2/broker/bin/ + + **/*.sh + **/*.bat + + true + 755 + + + + src/broker/bin + ${pom.artifactId}-${pom.version}/wso2/broker/bin/ + + **/*.sh + **/*.bat + + true + src/broker/resources/STRATOS_ROOT @@ -1075,64 +1141,6 @@ src/core/conf/tomcat/webapp-classloading-environments.xml ${pom.artifactId}-${pom.version}/conf/tomcat - - - src/core/bin/analytics.bat - ${pom.artifactId}-${pom.version}/bin - 755 - - - src/core/bin/analytics.sh - ${pom.artifactId}-${pom.version}/bin - 755 - - - src/core/bin/broker.bat - ${pom.artifactId}-${pom.version}/bin - 755 - - - src/core/bin/broker.sh - ${pom.artifactId}-${pom.version}/bin - 755 - - - src/core/bin/iot-server.bat - ${pom.artifactId}-${pom.version}/bin - 755 - - - src/core/bin/iot-server.sh - ${pom.artifactId}-${pom.version}/bin - 755 - - - src/core/bin/start-all.sh - ${pom.artifactId}-${pom.version}/bin - 755 - - - src/core/bin/start-all.bat - ${pom.artifactId}-${pom.version}/bin - 755 - - - src/core/bin/stop-all.sh - ${pom.artifactId}-${pom.version}/bin - 755 - - - - - - - - - src/core/bin/profile-creator.sh - ${pom.artifactId}-${pom.version}/bin - 755 - true - src/core/jaggeryapps/portal/configs/designer.json @@ -1692,43 +1700,6 @@ - - - - - src/analytics/bin/load-spark-env-vars.sh - ${pom.artifactId}-${pom.version}/wso2/analytics/bin/ - true - 755 - - - - - src/analytics/bin/load-spark-env-vars.bat - ${pom.artifactId}-${pom.version}/wso2/analytics/bin/ - true - 644 - - - - - - - src/analytics/bin/wso2server.sh - ${pom.artifactId}-${pom.version}/wso2/analytics/bin/ - true - 755 - - - - - src/analytics/bin/wso2server.bat - ${pom.artifactId}-${pom.version}/wso2/analytics/bin/ - - true - 644 - - @@ -1899,21 +1870,6 @@ ${pom.artifactId}-${pom.version}/wso2/broker/conf 644 - - - src/broker/bin/wso2server.sh - ${pom.artifactId}-${pom.version}/wso2/broker/bin/ - true - 755 - - - - src/broker/bin/wso2server.bat - ${pom.artifactId}-${pom.version}/wso2/broker/bin/ - - true - 644 - diff --git a/modules/distribution/src/broker/bin/build.xml b/modules/distribution/src/broker/bin/build.xml new file mode 100644 index 00000000..9256e7d9 --- /dev/null +++ b/modules/distribution/src/broker/bin/build.xml @@ -0,0 +1,266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Removing UI related jars located in : ${carbon.home}/repository/components/plugins + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/distribution/src/core/bin/build.xml b/modules/distribution/src/core/bin/build.xml new file mode 100644 index 00000000..46e7f496 --- /dev/null +++ b/modules/distribution/src/core/bin/build.xml @@ -0,0 +1,266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Removing UI related jars located in : ${carbon.home}/repository/components/plugins + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/distribution/src/core/bin/carbondump.bat b/modules/distribution/src/core/bin/carbondump.bat new file mode 100644 index 00000000..691c2ef3 --- /dev/null +++ b/modules/distribution/src/core/bin/carbondump.bat @@ -0,0 +1,198 @@ +@echo off + +REM --------------------------------------------------------------------------- +REM Copyright 2005-2009 WSO2, Inc. http://www.wso2.org +REM +REM Licensed under the Apache License, Version 2.0 (the "License"); +REM you may not use this file except in compliance with the License. +REM You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, software +REM distributed under the License is distributed on an "AS IS" BASIS, +REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +REM See the License for the specific language governing permissions and +REM limitations under the License. + +rem --------------------------------------------------------------------------- +rem Main Script for WSO2 Carbon +rem +rem Environment Variable Prequisites +rem +rem CARBON_HOME Home of CARBON installation. If not set I will try +rem to figure it out. +rem +rem JAVA_HOME Must point at your Java Development Kit installation. +rem +rem JAVA_OPTS (Optional) Java runtime options used when the commands +rem is executed. +rem --------------------------------------------------------------------------- + +rem ----- if JAVA_HOME is not set we're not happy ------------------------------ +:checkJava + +if "%JAVA_HOME%" == "" goto noJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome + +set CARBON_DUMP_HOME=%~sdp0.. +SET curDirectory=%cd% +SET curDrive=%cd:~0,1% +SET wsasDrive=%CARBON_DUMP_HOME:~0,1% +if not "%curDrive%" == "%wsasDrive%" %wsasDrive%: + +goto processInputs + +:noJavaHome +echo "You must set the JAVA_HOME variable before running CARBON." +goto end + +rem ----- Process the input command ------------------------------------------- +:processInputs +set CARBON_HOME= +set PID= + +rem Slurp the command line arguments. This loop allows for an unlimited number +rem of arguments (up to the command line limit, anyway). + +:setupArgs +if ""%1""=="""" goto invalidUsage + +:checkCarbonHome +if ""%1""==""-carbonHome"" goto setupCarbonHome +if ""%1""==""--carbonHome"" goto setupCarbonHome +if ""%1""==""carbonHome"" goto setupCarbonHome + +:checkPID +if ""%1""==""-pid"" goto setupPID +if ""%1""==""--pid"" goto setupPID +if ""%1""==""pid"" goto setupPID + +if "%CARBON_HOME%"=="" goto invalidUsage +if "%PID%"=="" goto invalidUsage +goto startCollectingData + +rem ----- setupCarbonHome------------------------------------------------------- +:setupCarbonHome +shift +set CARBON_HOME=%1 +if "%CARBON_HOME%"=="" goto invalidUsage +shift +goto checkPID + +rem ----- setupPID------------------------------------------------------- +:setupPID +shift +set PID=%1 +if "%PID%"=="" goto invalidUsage +shift +goto checkCarbonHome + +:startCollectingData +echo Start Collectiong data + + +SET DATE_TIME=%date:~-4,4%-%date:~-10,2%-%date:~-7,2%_%time:~0,2%-%time:~3,2% +echo %DATE_TIME% + +set OUTPUT_ROOT_DIR=%CARBON_DUMP_HOME%\carbondump +set OUTPUT_DIR=%OUTPUT_ROOT_DIR%\carbondump-%DATE_TIME% +set MEMORY_DUMP_DIR=%OUTPUT_DIR%\memoryinfo +set OS_INFO=%OUTPUT_DIR%\osinfo +set JAVA_INFO=%OUTPUT_DIR%\javainfo +set REPO_DIR=%OUTPUT_DIR%\repository + +if exist %OUTPUT_ROOT_DIR% rd /q/s %OUTPUT_ROOT_DIR% + +mkdir %OUTPUT_ROOT_DIR% +mkdir %OUTPUT_DIR% +mkdir %MEMORY_DUMP_DIR% +mkdir %OS_INFO% +mkdir %REPO_DIR% +mkdir %REPO_DIR%\logs +mkdir %REPO_DIR%\conf +mkdir %REPO_DIR%\database + +echo carbondump.bat##Generating the java memory dump... +jmap -dump:format=b,file=%MEMORY_DUMP_DIR%\java_heap_memory_dump.jmap %PID% +jmap -histo %PID% > %MEMORY_DUMP_DIR%\java_heap_histogram.txt +REM jmap -finalizerinfo %PID% > %MEMORY_DUMP_DIR%\objects_awaiting_finalization.txt +REM jmap -heap %PID% >> %MEMORY_DUMP_DIR%\java_heap_summary.txt +REM jmap -permstat %PID% >> %MEMORY_DUMP_DIR%\java_permgen_statistics.txt + +echo carbondump.bat##Generating the thread dump... +jstack %PID% > %OUTPUT_DIR%\thread_dump.txt + +echo carbondump.bat##Capturing system configuration information... +systeminfo > %OS_INFO%\system_information.txt + +echo carbondump.bat##Capturing information about the network connection and IP information... +ipconfig /all > %OS_INFO%\network_connection_information.txt + +echo carbondump.bat##Capturing information on active TCP connections, ports on which the computer is listening... +netstat -a -o > %OS_INFO%\activec_connections.txt + +echo carbondump.bat##Capturing information list of running tasks... +tasklist /v > %OS_INFO%\running_tasks_list.txt + +echo carbondump.bat##Directory structure... +echo Use the command "type directory_structure.txt" to view the content properly > %OUTPUT_DIR%\directory_structure.txt +tree >> %OUTPUT_DIR%\directory_structure.txt + +echo carbondump.bat##Capturing OS Environment Variables... +set > %OS_INFO%\os_env_variables.txt + +REM echo "\ncarbondump.sh##Generating the checksums of all the files in the CARBON_HOME directory..." +REM check fciv is exit or not +where fciv > temp.txt +if errorlevel==1 goto noFCIV +set /p _fciv=< temp.txt +if not exist %_fciv% goto noFCIV +fciv %CARBON_HOME% -r -md5 > %OUTPUT_DIR%\checksum_values.txt +goto endmd5 + +:noFCIV +echo File Checksum Integrity Verifier(FCIV) doesn't exist in class path +goto endmd5 + +:endmd5 +del temp.txt + +REM ##TODO out all the carbon info to a single file, java, vesion, os version, carbon version +REM echo "Product"'\t\t\t'": "`cat $CARBON_HOME/bin/version.txt` > $OUTPUT_DIR/carbon_server_info.txt +REM echo "WSO2 Carbon Framework"'\t'": "`cat $CARBON_HOME/bin/wso2carbon-version.txt` >> $OUTPUT_DIR/carbon_server_info.txt +REM echo "Carbon Home"'\t\t'": "`echo $CARBON_HOME` >> $OUTPUT_DIR/carbon_server_info.txt +REM echo "Operating System Info"'\t'": "`uname -a` >> $OUTPUT_DIR/carbon_server_info.txt +REM echo "Java Home"'\t\t'": "`echo $JAVA_HOME` >> $OUTPUT_DIR/carbon_server_info.txt +REM java -version 2> $OUTPUT_DIR/temp_java_version.txt +REM echo "Java Version"'\t\t'": "`cat $OUTPUT_DIR/temp_java_version.txt | grep -h "java version" | mawk '{print $3}'` >> $OUTPUT_DIR/carbon_server_info.txt +REM echo "Java VM"'\t\t\t'": "`cat $OUTPUT_DIR/temp_java_version.txt | grep -h "Java HotSpot"` >> $OUTPUT_DIR/carbon_server_info.txt +REM rm -rf $OUTPUT_DIR/temp_java_version.txt + +echo carbondump.bat##Copying log files... +copy %CARBON_HOME%\repository\logs\ %REPO_DIR%\logs + +echo carbondump.bat##Copying conf files... +copy %CARBON_HOME%\conf\ %REPO_DIR%\conf + +echo carbondump.bat##Copying database... +copy %CARBON_HOME%\repository\database\ %REPO_DIR%\database + +echo carbondump.bat##Compressing the carbondump... +cd %OUTPUT_ROOT_DIR% +if exist %CARBON_DUMP_HOME%\carbondump_%DATE_TIME%.zip del %CARBON_DUMP_HOME%\carbondump_%DATE_TIME%.zip +jar cvf %CARBON_DUMP_HOME%\carbondump_%DATE_TIME%.jar carbondump_%DATE_TIME% +cd %CARBON_DUMP_HOME% +rename carbondump_%DATE_TIME%.jar carbondump_%DATE_TIME%.zip + +echo carbondump: %CARBON_DUMP_HOME%\carbondump_%DATE_TIME%.zip +rd /q/s %OUTPUT_ROOT_DIR% +cd %curDirectory% + +goto end + +:invalidUsage +echo Usage: carbondump.bat [-carbonHome path] [-pid of the carbon instance] +echo e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.2.0\ -pid 5151 + +:END diff --git a/modules/distribution/src/core/bin/carbondump.sh b/modules/distribution/src/core/bin/carbondump.sh new file mode 100755 index 00000000..252ea49e --- /dev/null +++ b/modules/distribution/src/core/bin/carbondump.sh @@ -0,0 +1,238 @@ +#!/bin/bash +# ---------------------------------------------------------------------------- +# Copyright 2005-2009 WSO2, Inc. http://www.wso2.org +# +# 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 +# +# 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. + +# ---------------------------------------------------------------------------- +# +# Environment Variable Prequisites +# +# JAVA_HOME Must point at your Java Development Kit installation. +# +# JAVA_OPTS (Optional) Java runtime options used when the commands +# is executed. +# +# NOTE: Borrowed generously from Apache Tomcat startup scripts. +# ----------------------------------------------------------------------------- + +DARWIN_TOOLS="" +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +os400=false; +mingw=false; +case "`uname`" in +CYGWIN*) cygwin=true;; +MINGW*) mingw=true;; +OS400*) os400=true;; +Darwin*) darwin=true + if [ -z "$JAVA_VERSION" ] ; then + JAVA_VERSION="CurrentJDK" + else + echo "Using Java version: $JAVA_VERSION" + fi + if [ -z "$JAVA_HOME" ] ; then + JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home + DARWIN_TOOLS=$JAVA_HOME/Classes/Classes.jar + fi + ;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +# Get standard environment variables +PRGDIR=`dirname "$PRG"` + +CARBON_DUMP_HOME=`cd "$PRGDIR/.." ; pwd` + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# For OS400 +if $os400; then + # Set job priority to standard for interactive (interactive - 6) by using + # the interactive priority - 6, the helper threads that respond to requests + # will be running at the same priority as interactive jobs. + COMMAND='chgjob job('$JOBNAME') runpty(6)' + system $COMMAND + + # Enable multi threading + QIBM_MULTI_THREADED=Y + export QIBM_MULTI_THREADED +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD=java + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." + exit 1 +fi + +# if JAVA_HOME is not set we're not happy +if [ -z "$JAVA_HOME" ]; then + echo "You must set the JAVA_HOME variable." + exit 1 +fi + + +# ----- Process the input command ---------------------------------------------- +for c in $* +do + if [ "$c" = "--carbonHome" ] || [ "$c" = "-carbonHome" ] || [ "$c" = "carbonHome" ]; then + TEMP="--carbonHome" + continue + + elif [ "$TEMP" = "--carbonHome" ]; then + TEMP="" + if [ -z "$CARBON_HOME" ]; then + CARBON_HOME=$c + fi + + elif [ "$c" = "--pid" ] || [ "$c" = "-pid" ] || [ "$c" = "pid" ]; then + TEMP="--pid" + continue + + elif [ "$TEMP" = "--pid" ]; then + TEMP="" + if [ -z "$PID" ]; then + PID=$c + fi + fi +done + +if [ -z "$CARBON_HOME" ] || [ -z "$PID" ] ; then +echo "Usage: carbondump.sh [-carbonHome path] [-pid of the carbon instance]" +echo " e.g. carbondump.sh -carbonHome /home/user/wso2carbon-3.0.0/ -pid 5151" + +exit 1 +fi + +#time stamp that we are going to use for this execution. +DATE_TIME=`date +%F`_`date +%H-%M-%S` + +OUTPUT_ROOT_DIR=$CARBON_DUMP_HOME/carbondump +OUTPUT_DIR=$OUTPUT_ROOT_DIR/carbondump-$DATE_TIME +MEMORY_DUMP_DIR=$OUTPUT_DIR/memoryinfo +OS_INFO=$OUTPUT_DIR/osinfo +JAVA_INFO=$OUTPUT_DIR/javainfo +REPO_DIR=$OUTPUT_DIR/repository + +#Checks whether the output directory exists or not. +if [ -d "$OUTPUT_ROOT_DIR" ]; +then + rm -rf $OUTPUT_ROOT_DIR +fi + +mkdir $OUTPUT_ROOT_DIR +mkdir $OUTPUT_DIR +mkdir $MEMORY_DUMP_DIR +mkdir $OS_INFO +mkdir -p $REPO_DIR/logs +mkdir $REPO_DIR/conf +mkdir $REPO_DIR/database + +echo "\ncarbondump.sh##Generating the java memory dump..." +jmap $PID > $MEMORY_DUMP_DIR/shared_object_mappings.txt +jmap -dump:format=b,file=$MEMORY_DUMP_DIR/java_heap_memory_dump.jmap $PID +jmap -histo $PID > $MEMORY_DUMP_DIR/java_heap_histogram.txt +jmap -finalizerinfo $PID > $MEMORY_DUMP_DIR/objects_awaiting_finalization.txt +jmap -heap $PID > $MEMORY_DUMP_DIR/java_heap_summary.txt +jmap -permstat $PID > $MEMORY_DUMP_DIR/java_permgen_statistics.txt + +echo "\ncarbondump.sh##Generating the thread dump..." +jstack $PID > $OUTPUT_DIR/thread_dump.txt + +echo "\ncarbondump.sh##Capturing OS information..." +lsmod > $OS_INFO/os_module_list.txt + +cat /proc/meminfo > $OS_INFO/os_meminfo.txt +cat /proc/cpuinfo > $OS_INFO/os_cpuinfo.txt + +netstat -tulpn > $OS_INFO/os_open_ports.txt +ifconfig -a > $OS_INFO/os_network_cards.txt +dpkg --list > $OS_INFO/os_installed_software_unix_linux.txt +rpm -qa > $OS_INFO/os_installed_software_redhat_fedora.txt +w > $OS_INFO/os_system_up_time.txt + +lsmod | mawk '{print $1}' | xargs modinfo 2>/dev/null > $OS_INFO/os_module_info.txt + +echo "\ncarbondump.sh##Capturing the list of running task in the system..." +top -b -n1 > $OS_INFO/os_running_tasks.txt + +echo "\ncarbondump.sh##Capturing OS Environment Variables..." +env > $OS_INFO/os_env_variables.txt + +echo "\ncarbondump.sh##Generating the checksums of all the files in the CARBON_HOME directory..." +find $CARBON_HOME -iname "*" -type f | grep -v ./samples | grep -v ./docs | sort | xargs md5sum > $OUTPUT_DIR/checksum_values.txt + +##TODO out all the carbon info to a single file, java, vesion, os version, carbon version +echo "Product"'\t\t\t'": "`cat $CARBON_HOME/bin/version.txt` > $OUTPUT_DIR/carbon_server_info.txt +echo "WSO2 Carbon Framework"'\t'": "`cat $CARBON_HOME/bin/wso2carbon-version.txt` >> $OUTPUT_DIR/carbon_server_info.txt +echo "Carbon Home"'\t\t'": "`echo $CARBON_HOME` >> $OUTPUT_DIR/carbon_server_info.txt +echo "Operating System Info"'\t'": "`uname -a` >> $OUTPUT_DIR/carbon_server_info.txt +echo "Java Home"'\t\t'": "`echo $JAVA_HOME` >> $OUTPUT_DIR/carbon_server_info.txt +java -version 2> $OUTPUT_DIR/temp_java_version.txt +echo "Java Version"'\t\t'": "`cat $OUTPUT_DIR/temp_java_version.txt | grep -h "java version" | mawk '{print $3}'` >> $OUTPUT_DIR/carbon_server_info.txt +echo "Java VM"'\t\t\t'": "`cat $OUTPUT_DIR/temp_java_version.txt | grep -h "Java HotSpot"` >> $OUTPUT_DIR/carbon_server_info.txt +rm -rf $OUTPUT_DIR/temp_java_version.txt + +echo "\ncarbondump.sh##Copying log files..." +cp -r $CARBON_HOME/repository/logs/* $REPO_DIR/logs + +echo "\ncarbondump.sh##Copying conf files..." +cp -r $CARBON_HOME/conf/* $REPO_DIR/conf + +echo "\ncarbondump.sh##Copying database..." +cp -r $CARBON_HOME/repository/database/* $REPO_DIR/database + +echo "\ncarbondump.sh##Getting a directory listing..." +find $CARBON_HOME -type d | sort | grep -v ./samples | grep -v ./docs > $OUTPUT_DIR/directory_listing.txt + +echo "\ncarbondump.sh##Compressing the carbondump..." +cd $OUTPUT_ROOT_DIR +zip -r $CARBON_DUMP_HOME/carbondump-$DATE_TIME.zip carbondump-$DATE_TIME + +echo "\ncarbondump: "$CARBON_DUMP_HOME/carbondump-$DATE_TIME.zip"\n" +rm -rf $OUTPUT_ROOT_DIR +exit diff --git a/modules/distribution/src/core/bin/chpasswd.bat b/modules/distribution/src/core/bin/chpasswd.bat new file mode 100644 index 00000000..27e971a1 --- /dev/null +++ b/modules/distribution/src/core/bin/chpasswd.bat @@ -0,0 +1,76 @@ +@echo off +rem --------------------------------------------------------------------------- +rem Script for changing the password of a CARBON user +rem +rem Environment Variable Prequisites +rem +rem +rem JAVA_HOME Must point at your Java Development Kit installation. +rem +rem JAVA_OPTS (Optional) Java runtime options +rem --------------------------------------------------------------------------- +set CURRENT_DIR=%cd% + +rem Make sure prerequisite environment variables are set +if not "%JAVA_HOME%" == "" goto gotJavaHome +echo The JAVA_HOME environment variable is not defined +echo This environment variable is needed to run this program +goto end +:gotJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome +goto okJavaHome +:noJavaHome +echo The JAVA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +echo NB: JAVA_HOME should point to a JDK/JRE +goto end +:okJavaHome + +set CURRENT_DIR = %cd% +rem check the CARBON_HOME environment variable +if not "%CARBON_HOME%" == "" goto gotHome +set CARBON_HOME=%CURRENT_DIR% +if exist "%CARBON_HOME\bin\version.txt" goto okHome + +rem guess the home. Jump one directory up to check if that is the home +cd .. +set CARBON_HOME=%cd% +cd %CURRENT_DIR% >> NULL + +:gotHome +if not exist "%CARBON_HOME%\bin\version.txt" goto pathError + +SET curDrive=%cd:~0,1% +SET wsasDrive=%CARBON_HOME:~0,1% +if not "%curDrive%" == "%wsasDrive%" %wsasDrive%: + +goto okHome + +set CARBON_HOME=%~dp0.. +if exist "%CARBON_HOME%\bin\version.txt" goto okHome + +:pathError +echo The CARBON_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto end + +:okHome +setlocal EnableDelayedExpansion + +rem loop through the libs and add them to the class path +cd %CARBON_HOME% + +call ant -buildfile "%CARBON_HOME%"\bin\build.xml + +set CARBON_CLASSPATH=%CARBON_HOME% +FOR %%C in ("%CARBON_HOME%\wso2\lib\*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;./wso2/lib/%%~nC%%~xC +FOR %%C in ("%CARBON_HOME%\wso2\lib\api*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;./wso2/lib/api/%%~nC%%~xC +FOR %%C in ("%CARBON_HOME%\repository\lib\*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;./repository/lib/%%~nC%%~xC +set CARBON_CLASSPATH=.\lib\patches;.\conf;%CARBON_CLASSPATH% +rem ----- Execute The Requested Command --------------------------------------- +set _RUNJAVA="%JAVA_HOME%\bin\java" + +%_RUNJAVA% %JAVA_OPTS% -cp "%CARBON_CLASSPATH%" org.wso2.carbon.core.util.PasswordUpdater %* +endlocal +if not "%curDrive%" == "%wsasDrive%" %curDrive%: +:end diff --git a/modules/distribution/src/core/bin/chpasswd.sh b/modules/distribution/src/core/bin/chpasswd.sh new file mode 100755 index 00000000..9f28b163 --- /dev/null +++ b/modules/distribution/src/core/bin/chpasswd.sh @@ -0,0 +1,116 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Copyright 2005,2006 WSO2, Inc. http://www.wso2.org +# +# 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 +# +# 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. + +# ----------------------------------------------------------------------------- +# +# Environment Variable Prequisites +# +# CARBON_HOME Home of CARBON installation. If not set I will try +# to figure it out. +# +# JAVA_HOME Must point at your Java Development Kit installation. +# +# NOTE: Borrowed generously from Apache Tomcat startup scripts. + +# if JAVA_HOME is not set we're not happy +if [ -z "$JAVA_HOME" ]; then + echo "You must set the JAVA_HOME variable before running chpasswd." + exit 1 +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +os400=false +case "`uname`" in +CYGWIN*) cygwin=true;; +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +# Get standard environment variables +PRGDIR=`dirname "$PRG"` + +# Only set CARBON_HOME if not already set +[ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd` + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CARBON_HOME" ] && CARBON_HOME=`cygpath --unix "$CARBON_HOME"` + [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For OS400 +if $os400; then + # Set job priority to standard for interactive (interactive - 6) by using + # the interactive priority - 6, the helper threads that respond to requests + # will be running at the same priority as interactive jobs. + COMMAND='chgjob job('$JOBNAME') runpty(6)' + system $COMMAND + + # Enable multi threading + QIBM_MULTI_THREADED=Y + export QIBM_MULTI_THREADED +fi + +ant -buildfile "$CARBON_HOME"/bin/build.xml + +# update classpath +CARBON_CLASSPATH="" +for f in "$CARBON_HOME"/wso2/lib/*.jar +do + CARBON_CLASSPATH=$CARBON_CLASSPATH:$f +done + +for g in "$CARBON_HOME"/repository/lib/*.jar +do + CARBON_CLASSPATH=$CARBON_CLASSPATH:$g +done + +for h in "$CARBON_HOME"/wso2/lib/api/*.jar +do + CARBON_CLASSPATH=$CARBON_CLASSPATH:$h +done + +CARBON_CLASSPATH=$CARBON_CLASSPATH:$CLASSPATH + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` + CARBON_HOME=`cygpath --absolute --windows "$CARBON_HOME"` + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` +fi + +# ----- Execute The Requested Command ----------------------------------------- +cd "$CARBON_HOME" + +CARBON_CLASSPATH="$CARBON_HOME/lib/patches":"$CARBON_HOME/conf":$CARBON_CLASSPATH + +$JAVA_HOME/bin/java -cp "$CARBON_CLASSPATH" org.wso2.carbon.core.util.PasswordUpdater $* + diff --git a/modules/distribution/src/core/bin/ciphertool.bat b/modules/distribution/src/core/bin/ciphertool.bat new file mode 100644 index 00000000..99d55fc8 --- /dev/null +++ b/modules/distribution/src/core/bin/ciphertool.bat @@ -0,0 +1,89 @@ +@echo off +REM Copyright 2005-2009 WSO2, Inc. (http://wso2.com) +REM Licensed to the Apache Software Foundation (ASF) under one +REM or more contributor license agreements. See the NOTICE file +REM distributed with this work for additional information +REM regarding copyright ownership. The ASF licenses this file +REM to you under the Apache License, Version 2.0 (the +REM "License"); you may not use this file except in compliance +REM with the License. You may obtain a copy of the License at +REM +REM http://www.apache.org/licenses/LICENSE-2.0 +REM +REM Unless required by applicable law or agreed to in writing, +REM software distributed under the License is distributed on an +REM # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +REM KIND, either express or implied. See the License for the +REM specific language governing permissions and limitations +REM under the License. + +rem --------------------------------------------------------------------------- +rem Startup script for the ciphertool +rem +rem Environment Variable Prerequisites +rem +rem CARBON_HOME Must point at your CARBON directory +rem +rem JAVA_HOME Must point at your Java Development Kit installation. +rem +rem JAVA_OPTS (Optional) Java runtime options +rem --------------------------------------------------------------------------- + +rem Make sure prerequisite environment variables are set +if not "%JAVA_HOME%" == "" goto gotJavaHome +echo The JAVA_HOME environment variable is not defined +echo This environment variable is needed to run this program +goto end + +:gotJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome +goto okJavaHome + +:noJavaHome +echo The JAVA_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +echo NB: JAVA_HOME should point to a JDK/JRE +goto end + +:okJavaHome +rem check the CARBON_HOME environment variable + +set CURRENT_DIR=%cd% +if not "%CARBON_HOME%" == "" goto gotHome +set CARBON_HOME=%CURRENT_DIR% +if exist "%CARBON_HOME%\bin\ciphertool.bat" goto okHome + +rem guess the home. Jump one directory up to check if that is the home +cd .. +set CARBON_HOME=%cd% +cd %CARBON_HOME% + +:gotHome +if exist "%CARBON_HOME%\bin\ciphertool.bat" goto okHome + +rem set CARBON_HOME=%~sdp0.. +set CARBON_HOME=%~sdp0.. +if exist "%CARBON_HOME%\bin\ciphertool.bat" goto okHome + +echo The CARBON_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto end + +:okHome +rem set the classes +setlocal EnableDelayedExpansion +rem loop through the libs and add them to the class path +cd "%CARBON_HOME%" +call ant -buildfile "%CARBON_HOME%\bin\build.xml" -q +set CARBON_CLASSPATH=.\conf +FOR %%c in ("%CARBON_HOME%\wso2\lib\*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\wso2\lib\%%~nc%%~xc" +FOR %%C in ("%CARBON_HOME%\repository\lib\*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\repository\lib\%%~nC%%~xC" + +rem ----- Execute The Requested Command --------------------------------------- +echo Using CARBON_HOME: %CARBON_HOME% +echo Using JAVA_HOME: %JAVA_HOME% +set _RUNJAVA="%JAVA_HOME%\bin\java" + +%_RUNJAVA% %JAVA_OPTS% -Dcarbon.home="%CARBON_HOME%" -cp "%CARBON_CLASSPATH%" org.wso2.ciphertool.CipherTool %* +endlocal +:end \ No newline at end of file diff --git a/modules/distribution/src/core/bin/ciphertool.sh b/modules/distribution/src/core/bin/ciphertool.sh new file mode 100755 index 00000000..97bca840 --- /dev/null +++ b/modules/distribution/src/core/bin/ciphertool.sh @@ -0,0 +1,127 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Copyright 2005-2009 WSO2, Inc. (http://wso2.com) +# 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 +# +# 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. + +# ----------------------------------------------------------------------------- +# ciphertool script for generating stub, skeleton and other required classes +# +# Environment Variable Prequisites +# +# CARBON_HOME Home of CARBON installation. If not set I will try +# to figure it out. +# +# JAVA_HOME Must point at your Java Development Kit installation. +# +# NOTE: Borrowed generously from Apache Tomcat startup scripts. + +# if JAVA_HOME is not set we're not happy +if [ -z "$JAVA_HOME" ]; then + echo "You must set the JAVA_HOME variable before running CARBON." + exit 1 +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +os400=false; +mingw=false; +case "`uname`" in +CYGWIN*) cygwin=true;; +MINGW*) mingw=true;; +OS400*) os400=true;; +Darwin*) darwin=true + if [ -z "$JAVA_VERSION" ] ; then + JAVA_VERSION="CurrentJDK" + else + echo "Using Java version: $JAVA_VERSION" + fi + if [ -z "$JAVA_HOME" ] ; then + JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home + fi + ;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +# Get standard environment variables +PRGDIR=`dirname "$PRG"` + +# Only set CARBON_HOME if not already set +[ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd` + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CARBON_HOME" ] && CARBON_HOME=`cygpath --unix "$CARBON_HOME"` + [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For OS400 +if $os400; then + # Set job priority to standard for interactive (interactive - 6) by using + # the interactive priority - 6, the helper threads that respond to requests + # will be running at the same priority as interactive jobs. + COMMAND='chgjob job('$JOBNAME') runpty(6)' + system $COMMAND + + # Enable multi threading + QIBM_MULTI_THREADED=Y + export QIBM_MULTI_THREADED +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$CARBON_HOME" ] && + CARBON_HOME="`(cd "$CARBON_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + [ -n "$AXIS2_HOME" ] && + CARBON_HOME="`(cd "$CARBON_HOME"; pwd)`" + # TODO classpath? +fi + +# update classpath +CARBON_CLASSPATH="" +for f in "$CARBON_HOME"/wso2/lib/org.wso2.ciphertool*.jar +do + CARBON_CLASSPATH=$CARBON_CLASSPATH:$f +done +for h in "$CARBON_HOME"/wso2/components/plugins/*.jar +do + CARBON_CLASSPATH=$CARBON_CLASSPATH:$h +done +CARBON_CLASSPATH=$CARBON_CLASSPATH:$CLASSPATH + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` + CARBON_HOME=`cygpath --absolute --windows "$CARBON_HOME"` + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` +fi + +# ----- Execute The Requested Command ----------------------------------------- + +$JAVA_HOME/bin/java -Dcarbon.home="$CARBON_HOME" -classpath "$CARBON_CLASSPATH" org.wso2.ciphertool.CipherTool $* diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index 3725e86a..7ac5fe92 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -62,12 +62,14 @@ then rm -rf ${DIR}/../plugins rm -rf ${DIR}/profile-creator.sh rm -rf ${DIR}/profile-creator.bat - cp -rf ${DIR}/../repository/resources/profiles/gateway/* ${DIR}/../bin/ + cp -rf ${DIR}/../repository/resources/profiles/gateway/*.sh ${DIR}/../bin/ + cp -rf ${DIR}/../repository/resources/profiles/gateway/carbon.xml ${DIR}/../conf/ rm -rf ${DIR}/../repository/deployment/server/jaggeryapps/* rm -rf ${DIR}/../repository/deployment/server/webapps/* rm -rf ${DIR}/../repository/deployment/server/carbonapps/* rm -rf ${DIR}/../repository/deployment/server/axis2services/* rm -rf ${DIR}/../repository/deployment/server/devicetypes/* + rm -rf ${DIR}/../conf/identity/sso-idp-config.xml PROFILE="_gateway" @@ -97,7 +99,8 @@ then rm -rf ${DIR}/../plugins rm -rf ${DIR}/profile-creator.sh rm -rf ${DIR}/profile-creator.bat - cp -rf ${DIR}/../repository/resources/profiles/keymanager/* ${DIR}/../bin/ + cp -rf ${DIR}/../repository/resources/profiles/keymanager/*.sh ${DIR}/../bin/ + cp -rf ${DIR}/../repository/resources/profiles/gateway/carbon.xml ${DIR}/../conf/ rm -rf ${DIR}/../repository/deployment/server/jaggeryapps/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/api/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/sequences/_*.xml @@ -142,11 +145,13 @@ then rm -rf ${DIR}/profile-creator.bat rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/api/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/sequences/_*.xml - cp -rf ${DIR}/../repository/resources/profiles/backend/* ${DIR}/../bin/ + cp -rf ${DIR}/../repository/resources/profiles/backend/*.sh ${DIR}/../bin/ + cp -rf ${DIR}/../repository/resources/profiles/gateway/carbon.xml ${DIR}/../conf/ rm -rf ${DIR}/../repository/deployment/server/webapps/oauth2.war ${DIR}/../repository/deployment/server/webapps/shindig.war ${DIR}/../repository/deployment/server/webapps/api#am#publisher#v0.11.war ${DIR}/../repository/deployment/server/webapps/api#am#store#v0.11.war ${DIR}/../repository/deployment/server/webapps/api#appm#oauth#v1.0.war ${DIR}/../repository/deployment/server/webapps/api#appm#publisher#v1.1.war ${DIR}/../repository/deployment/server/webapps/api#appm#store#v1.1.war rm -rf ${DIR}/../repository/deployment/server/webapps/dynamic-client-web.war ${DIR}/../repository/deployment/server/webapps/client-registration#v0.11.war rm -rf ${DIR}/../repository/deployment/server/jaggeryapps/* rm -rf ${DIR}/../repository/deployment/server/axis2services/* + rm -rf ${DIR}/../conf/identity/sso-idp-config.xml PROFILE="_device-backend" @@ -176,7 +181,8 @@ then rm -rf ${DIR}/../plugins rm -rf ${DIR}/profile-creator.sh rm -rf ${DIR}/profile-creator.bat - cp -rf ${DIR}/../repository/resources/profiles/manager/* ${DIR}/../bin/ + cp -rf ${DIR}/../repository/resources/profiles/manager/*.sh ${DIR}/../bin/ + cp -rf ${DIR}/../repository/resources/profiles/gateway/carbon.xml ${DIR}/../conf/ mkdir ${DIR}/../repository/deployment/server/tempwebapp cp ${DIR}/../repository/deployment/server/webapps/api#am#publisher#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ cp ${DIR}/../repository/deployment/server/webapps/api#am#store#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ @@ -190,6 +196,7 @@ then rm -rf ${DIR}/../repository/deployment/server/axis2services/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/api/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/sequences/_*.xml + rm -rf ${DIR}/../conf/identity/sso-idp-config.xml PROFILE="_device-manager" diff --git a/modules/distribution/src/core/plugins/plugins-deployer.xml b/modules/distribution/src/core/plugins/plugins-deployer.xml index 61d2bef2..3c3c5d3b 100644 --- a/modules/distribution/src/core/plugins/plugins-deployer.xml +++ b/modules/distribution/src/core/plugins/plugins-deployer.xml @@ -207,6 +207,6 @@ - 3.0.17 + 3.0.21 \ No newline at end of file diff --git a/modules/distribution/src/core/resources/profiles/backend/carbon.xml b/modules/distribution/src/core/resources/profiles/backend/carbon.xml new file mode 100644 index 00000000..a68678fb --- /dev/null +++ b/modules/distribution/src/core/resources/profiles/backend/carbon.xml @@ -0,0 +1,688 @@ + + + + + + + + + ${product.name} + + + ${product.key} + + + ${product.version} + + + + localhost + + + localhost + + + local:/${carbon.context}/services/ + + + + + + + ${default.server.role} + ${cdmf.analytics.role} + CDMFPlatform + + + + + + + org.wso2.carbon + + + / + + + + + + + + + 15 + + + + + + + + + 1 + + + + + 9999 + + 11111 + + + + + + 10389 + + 8000 + + + + + + 10500 + + + + + + + org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory + + + + + + + + + java + + + + + + + + + + false + + + false + + + 600 + + + + false + + + + + + + + 30 + + + + + + + + + 15 + + + + + + ${carbon.home}/repository/deployment/server/ + + + 15 + + + ${carbon.home}/conf/axis2/axis2.xml + + + 30000 + + + ${carbon.home}/repository/deployment/client/ + + ${carbon.home}/conf/axis2/axis2_client.xml + + true + + + + + + + + + + admin + Default Administrator Role + + + user + Default User Role + + + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + + + + + ${carbon.home}/repository/resources/security/client-truststore.jks + + JKS + + wso2carbon + + + + + + + + + + + + + + + + + + + UserManager + + + false + + + + + + + + + + ${carbon.home}/tmp/work + + + + + + true + + + 10 + + + 30 + + + + + + 100 + + + + keystore + certificate + * + + org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor + + + + + jarZip + + org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor + + + + dbs + + org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor + + + + tools + + org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor + + + + toolsAny + + org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor + + + + + + + info + org.wso2.carbon.core.transports.util.InfoProcessor + + + wsdl + org.wso2.carbon.core.transports.util.Wsdl11Processor + + + wsdl2 + org.wso2.carbon.core.transports.util.Wsdl20Processor + + + xsd + org.wso2.carbon.core.transports.util.XsdProcessor + + + + + + false + false + true + svn + http://svnrepo.example.com/repos/ + username + password + true + + + + + + + + + + + + + + + ${require.carbon.servlet} + + + + + true + + + + + + + default repository + http://dist.wso2.org/p2/carbon/releases/4.4.1-SNAPSHOT + + + + + + + + true + + + + + + true + + diff --git a/modules/distribution/src/core/resources/profiles/backend/iot-server.bat b/modules/distribution/src/core/resources/profiles/backend/iot-server.bat index fc200237..baf8cdac 100644 --- a/modules/distribution/src/core/resources/profiles/backend/iot-server.bat +++ b/modules/distribution/src/core/resources/profiles/backend/iot-server.bat @@ -168,7 +168,7 @@ set JAVA_ENDORSED=".\wso2\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HO set profile=-Dprofile=device-backend -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" %profile% +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="9444" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9447" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8248" -Diot.gateway.http.port="8285" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" %profile% :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/resources/profiles/backend/iot-server.sh b/modules/distribution/src/core/resources/profiles/backend/iot-server.sh index e500c0d4..077583d1 100755 --- a/modules/distribution/src/core/resources/profiles/backend/iot-server.sh +++ b/modules/distribution/src/core/resources/profiles/backend/iot-server.sh @@ -323,12 +323,12 @@ do -Dmqtt.broker.host="localhost" \ -Dmqtt.broker.port="1886" \ -Diot.core.host="localhost" \ - -Diot.core.https.port="9443" \ + -Diot.core.https.port="9444" \ -Diot.keymanager.host="localhost" \ - -Diot.keymanager.https.port="9443" \ + -Diot.keymanager.https.port="9447" \ -Diot.gateway.host="localhost" \ - -Diot.gateway.https.port="8243" \ - -Diot.gateway.http.port="8280" \ + -Diot.gateway.https.port="8248" \ + -Diot.gateway.http.port="8285" \ -Diot.apimpublisher.host="localhost" \ -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ diff --git a/modules/distribution/src/core/resources/profiles/gateway/carbon.xml b/modules/distribution/src/core/resources/profiles/gateway/carbon.xml new file mode 100644 index 00000000..9f90eed4 --- /dev/null +++ b/modules/distribution/src/core/resources/profiles/gateway/carbon.xml @@ -0,0 +1,688 @@ + + + + + + + + + ${product.name} + + + ${product.key} + + + ${product.version} + + + + localhost + + + localhost + + + local:/${carbon.context}/services/ + + + + + + + ${default.server.role} + ${cdmf.analytics.role} + CDMFPlatform + + + + + + + org.wso2.carbon + + + / + + + + + + + + + 15 + + + + + + + + + 5 + + + + + 9999 + + 11111 + + + + + + 10389 + + 8000 + + + + + + 10500 + + + + + + + org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory + + + + + + + + + java + + + + + + + + + + false + + + false + + + 600 + + + + false + + + + + + + + 30 + + + + + + + + + 15 + + + + + + ${carbon.home}/repository/deployment/server/ + + + 15 + + + ${carbon.home}/conf/axis2/axis2.xml + + + 30000 + + + ${carbon.home}/repository/deployment/client/ + + ${carbon.home}/conf/axis2/axis2_client.xml + + true + + + + + + + + + + admin + Default Administrator Role + + + user + Default User Role + + + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + + + + + ${carbon.home}/repository/resources/security/client-truststore.jks + + JKS + + wso2carbon + + + + + + + + + + + + + + + + + + + UserManager + + + false + + + + + + + + + + ${carbon.home}/tmp/work + + + + + + true + + + 10 + + + 30 + + + + + + 100 + + + + keystore + certificate + * + + org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor + + + + + jarZip + + org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor + + + + dbs + + org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor + + + + tools + + org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor + + + + toolsAny + + org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor + + + + + + + info + org.wso2.carbon.core.transports.util.InfoProcessor + + + wsdl + org.wso2.carbon.core.transports.util.Wsdl11Processor + + + wsdl2 + org.wso2.carbon.core.transports.util.Wsdl20Processor + + + xsd + org.wso2.carbon.core.transports.util.XsdProcessor + + + + + + false + false + true + svn + http://svnrepo.example.com/repos/ + username + password + true + + + + + + + + + + + + + + + ${require.carbon.servlet} + + + + + true + + + + + + + default repository + http://dist.wso2.org/p2/carbon/releases/4.4.1-SNAPSHOT + + + + + + + + true + + + + + + true + + diff --git a/modules/distribution/src/core/resources/profiles/gateway/iot-server.bat b/modules/distribution/src/core/resources/profiles/gateway/iot-server.bat index 72d30681..50d0c557 100644 --- a/modules/distribution/src/core/resources/profiles/gateway/iot-server.bat +++ b/modules/distribution/src/core/resources/profiles/gateway/iot-server.bat @@ -168,7 +168,7 @@ set JAVA_ENDORSED=".\wso2\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HO set profile=-Dprofile=http-gateway -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" %profile% +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="9444" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9447" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8248" -Diot.gateway.http.port="8285" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" %profile% :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/resources/profiles/gateway/iot-server.sh b/modules/distribution/src/core/resources/profiles/gateway/iot-server.sh index d936025e..e18080a7 100755 --- a/modules/distribution/src/core/resources/profiles/gateway/iot-server.sh +++ b/modules/distribution/src/core/resources/profiles/gateway/iot-server.sh @@ -323,12 +323,12 @@ do -Dmqtt.broker.host="localhost" \ -Dmqtt.broker.port="1886" \ -Diot.core.host="localhost" \ - -Diot.core.https.port="9443" \ + -Diot.core.https.port="9444" \ -Diot.keymanager.host="localhost" \ - -Diot.keymanager.https.port="9443" \ + -Diot.keymanager.https.port="9447" \ -Diot.gateway.host="localhost" \ - -Diot.gateway.https.port="8243" \ - -Diot.gateway.http.port="8280" \ + -Diot.gateway.https.port="8248" \ + -Diot.gateway.http.port="8285" \ -Diot.apimpublisher.host="localhost" \ -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ diff --git a/modules/distribution/src/core/resources/profiles/keymanager/carbon.xml b/modules/distribution/src/core/resources/profiles/keymanager/carbon.xml new file mode 100644 index 00000000..a1baefa2 --- /dev/null +++ b/modules/distribution/src/core/resources/profiles/keymanager/carbon.xml @@ -0,0 +1,688 @@ + + + + + + + + + ${product.name} + + + ${product.key} + + + ${product.version} + + + + localhost + + + localhost + + + local:/${carbon.context}/services/ + + + + + + + ${default.server.role} + ${cdmf.analytics.role} + CDMFPlatform + + + + + + + org.wso2.carbon + + + / + + + + + + + + + 15 + + + + + + + + + 4 + + + + + 9999 + + 11111 + + + + + + 10389 + + 8000 + + + + + + 10500 + + + + + + + org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory + + + + + + + + + java + + + + + + + + + + false + + + false + + + 600 + + + + false + + + + + + + + 30 + + + + + + + + + 15 + + + + + + ${carbon.home}/repository/deployment/server/ + + + 15 + + + ${carbon.home}/conf/axis2/axis2.xml + + + 30000 + + + ${carbon.home}/repository/deployment/client/ + + ${carbon.home}/conf/axis2/axis2_client.xml + + true + + + + + + + + + + admin + Default Administrator Role + + + user + Default User Role + + + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + + + + + ${carbon.home}/repository/resources/security/client-truststore.jks + + JKS + + wso2carbon + + + + + + + + + + + + + + + + + + + UserManager + + + false + + + + + + + + + + ${carbon.home}/tmp/work + + + + + + true + + + 10 + + + 30 + + + + + + 100 + + + + keystore + certificate + * + + org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor + + + + + jarZip + + org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor + + + + dbs + + org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor + + + + tools + + org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor + + + + toolsAny + + org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor + + + + + + + info + org.wso2.carbon.core.transports.util.InfoProcessor + + + wsdl + org.wso2.carbon.core.transports.util.Wsdl11Processor + + + wsdl2 + org.wso2.carbon.core.transports.util.Wsdl20Processor + + + xsd + org.wso2.carbon.core.transports.util.XsdProcessor + + + + + + false + false + true + svn + http://svnrepo.example.com/repos/ + username + password + true + + + + + + + + + + + + + + + ${require.carbon.servlet} + + + + + true + + + + + + + default repository + http://dist.wso2.org/p2/carbon/releases/4.4.1-SNAPSHOT + + + + + + + + true + + + + + + true + + diff --git a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat index 3105ae6b..43abecc6 100644 --- a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat +++ b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat @@ -168,7 +168,7 @@ set JAVA_ENDORSED=".\wso2\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HO set profile=-Dprofile=device-key-manager -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" %profile% +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="9444" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9447" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8248" -Diot.gateway.http.port="8285" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" %profile% :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/resources/profiles/keymanager/iot-server.sh b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh index daddb52b..40c14ade 100755 --- a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh +++ b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh @@ -323,12 +323,12 @@ do -Dmqtt.broker.host="localhost" \ -Dmqtt.broker.port="1886" \ -Diot.core.host="localhost" \ - -Diot.core.https.port="9443" \ + -Diot.core.https.port="9444" \ -Diot.keymanager.host="localhost" \ - -Diot.keymanager.https.port="9443" \ + -Diot.keymanager.https.port="9447" \ -Diot.gateway.host="localhost" \ - -Diot.gateway.https.port="8243" \ - -Diot.gateway.http.port="8280" \ + -Diot.gateway.https.port="8248" \ + -Diot.gateway.http.port="8285" \ -Diot.apimpublisher.host="localhost" \ -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ diff --git a/modules/distribution/src/core/resources/profiles/manager/carbon.xml b/modules/distribution/src/core/resources/profiles/manager/carbon.xml new file mode 100644 index 00000000..8d79c7cb --- /dev/null +++ b/modules/distribution/src/core/resources/profiles/manager/carbon.xml @@ -0,0 +1,688 @@ + + + + + + + + + ${product.name} + + + ${product.key} + + + ${product.version} + + + + localhost + + + localhost + + + local:/${carbon.context}/services/ + + + + + + + ${default.server.role} + ${cdmf.analytics.role} + CDMFPlatform + + + + + + + org.wso2.carbon + + + / + + + + + + + + + 15 + + + + + + + + + 0 + + + + + 9999 + + 11111 + + + + + + 10389 + + 8000 + + + + + + 10500 + + + + + + + org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory + + + + + + + + + java + + + + + + + + + + false + + + false + + + 600 + + + + false + + + + + + + + 30 + + + + + + + + + 15 + + + + + + ${carbon.home}/repository/deployment/server/ + + + 15 + + + ${carbon.home}/conf/axis2/axis2.xml + + + 30000 + + + ${carbon.home}/repository/deployment/client/ + + ${carbon.home}/conf/axis2/axis2_client.xml + + true + + + + + + + + + + admin + Default Administrator Role + + + user + Default User Role + + + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + + + + + ${carbon.home}/repository/resources/security/client-truststore.jks + + JKS + + wso2carbon + + + + + + + + + + + + + + + + + + + UserManager + + + false + + + + + + + + + + ${carbon.home}/tmp/work + + + + + + true + + + 10 + + + 30 + + + + + + 100 + + + + keystore + certificate + * + + org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor + + + + + jarZip + + org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor + + + + dbs + + org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor + + + + tools + + org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor + + + + toolsAny + + org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor + + + + + + + info + org.wso2.carbon.core.transports.util.InfoProcessor + + + wsdl + org.wso2.carbon.core.transports.util.Wsdl11Processor + + + wsdl2 + org.wso2.carbon.core.transports.util.Wsdl20Processor + + + xsd + org.wso2.carbon.core.transports.util.XsdProcessor + + + + + + false + false + true + svn + http://svnrepo.example.com/repos/ + username + password + true + + + + + + + + + + + + + + + ${require.carbon.servlet} + + + + + true + + + + + + + default repository + http://dist.wso2.org/p2/carbon/releases/4.4.1-SNAPSHOT + + + + + + + + true + + + + + + true + + diff --git a/modules/distribution/src/core/resources/profiles/manager/iot-server.bat b/modules/distribution/src/core/resources/profiles/manager/iot-server.bat index cc61ba3f..00c67a65 100644 --- a/modules/distribution/src/core/resources/profiles/manager/iot-server.bat +++ b/modules/distribution/src/core/resources/profiles/manager/iot-server.bat @@ -168,7 +168,7 @@ set JAVA_ENDORSED=".\wso2\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HO set profile=-Dprofile=device-manager -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" %profile% +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="9444" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9447" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8248" -Diot.gateway.http.port="8285" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="9443" %profile% :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/resources/profiles/manager/iot-server.sh b/modules/distribution/src/core/resources/profiles/manager/iot-server.sh index 91667a2f..83929555 100755 --- a/modules/distribution/src/core/resources/profiles/manager/iot-server.sh +++ b/modules/distribution/src/core/resources/profiles/manager/iot-server.sh @@ -323,12 +323,12 @@ do -Dmqtt.broker.host="localhost" \ -Dmqtt.broker.port="1886" \ -Diot.core.host="localhost" \ - -Diot.core.https.port="9443" \ + -Diot.core.https.port="9444" \ -Diot.keymanager.host="localhost" \ - -Diot.keymanager.https.port="9443" \ + -Diot.keymanager.https.port="9447" \ -Diot.gateway.host="localhost" \ - -Diot.gateway.https.port="8243" \ - -Diot.gateway.http.port="8280" \ + -Diot.gateway.https.port="8248" \ + -Diot.gateway.http.port="8285" \ -Diot.apimpublisher.host="localhost" \ -Diot.apimpublisher.https.port="9443" \ -Diot.apimstore.host="localhost" \ diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index cd55e41d..3792f4f3 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -1959,14 +1959,6 @@ org.wso2.carbon.apimgt.gateway.feature.group ${carbon.api.mgt.version} - - - - - - org.wso2.carbon.policy.mgt.server.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.apimgt.application.extension.feature.group ${carbon.device.mgt.version} @@ -2189,14 +2181,6 @@ org.wso2.carbon.mediator.cache.feature.group ${carbon.mediation.version} - - org.wso2.carbon.application.mgt.server.feature.group ${carbon.commons.version} @@ -2356,18 +2340,6 @@ org.wso2.carbon.apimgt.keymanager.feature.group ${carbon.api.mgt.version} - - org.wso2.carbon.registry.extensions.feature.group - ${carbon.governance.version} - - - org.wso2.carbon.registry.extensions.server.feature.group - ${carbon.governance.version} - - - org.wso2.carbon.registry.contentsearch.feature.group - ${carbon.registry.version.iotcore} - org.wso2.carbon.idp.mgt.feature.group ${carbon.identity.framework.version} @@ -2463,10 +2435,6 @@ org.wso2.carbon.apimgt.gateway.feature.group ${carbon.api.mgt.version} - - org.wso2.carbon.policy.mgt.server.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.apimgt.application.extension.feature.group ${carbon.device.mgt.version} @@ -3135,10 +3103,6 @@ org.wso2.carbon.apimgt.gateway.feature.group ${carbon.api.mgt.version} - - org.wso2.carbon.policy.mgt.server.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.apimgt.application.extension.feature.group ${carbon.device.mgt.version} From 69fff375650d27ba0e0277db12f4b3b1a477e3b2 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Mon, 17 Apr 2017 11:19:13 +0530 Subject: [PATCH 2/7] Resolving the issue in resolving the porduct version for profile-creator.sh. --- modules/distribution/src/assembly/bin.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 14db14af..151a48fd 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -270,6 +270,7 @@ **/*.sh **/*.bat + true 755 From 791ee451642b31d28596eb2bc5b99b2b462d3e73 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Mon, 17 Apr 2017 11:46:57 +0530 Subject: [PATCH 3/7] Fixing issue - https://github.com/wso2/product-iots/issues/358. --- modules/distribution/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index ae1c8f74..6d9ddcce 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -667,6 +667,10 @@ + + + + @@ -780,6 +784,12 @@ + + + + + + From 12165fa99645454a188c59881495bf5447529b0b Mon Sep 17 00:00:00 2001 From: sinthuja Date: Mon, 17 Apr 2017 12:36:18 +0530 Subject: [PATCH 4/7] Moving the profiles distributions into the temp directory. --- .../src/core/bin/profile-creator.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index 7ac5fe92..9e8d1e87 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -36,6 +36,20 @@ echo " 5.Analytics Profile" echo " 6.Broker profile" echo "Please enter the desired profile number to create the profile specific distribution." read profileNumber + +if [ "$profileNumber" -lt 7 ] && [ "$profileNumber" -gt 0 ] ; then + TEMPDIR=${DIR}/../../tmp + + if [ ! -d "$TEMPDIR" ]; then + echo "Creating temporary directory" + mkdir ${TEMPDIR} + fi + + echo "Copying the distribution to the temporary directory" + cp -rf ${DIR}/../../${DISTRIBUTION} ${TEMPDIR}/ + DIR=${TEMPDIR}/${DISTRIBUTION}/bin +fi + #gateway profile if [ ${profileNumber} -eq 1 ] then @@ -283,7 +297,8 @@ mv ${DIR}/../wso2/components/tmp_plugins ${DIR}/../wso2/components/plugins echo "Preparing a profile distribution archive." cd ${DIR}/../../ -zip -r ${DISTRIBUTION}${PROFILE}.zip ${DISTRIBUTION}/ +mv ${DISTRIBUTION} ${DISTRIBUTION}${PROFILE} +zip -r ${DISTRIBUTION}${PROFILE}.zip ${DISTRIBUTION}${PROFILE}/ -echo "Profile creation completed successfully." +echo "Profile created successfully in "$(pwd)"/"${DISTRIBUTION}${PROFILE} exit 0 From 45d02838fe1900c2001d978618c84a3c6e6b814f Mon Sep 17 00:00:00 2001 From: sinthuja Date: Mon, 17 Apr 2017 14:30:04 +0530 Subject: [PATCH 5/7] Adding all profiles creation in profile-creator.sh. --- .../src/core/bin/profile-creator.sh | 46 +++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index 9e8d1e87..10fa3a91 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -23,6 +23,8 @@ DIR="$(dirname "${BASH_SOURCE[0]}")" DISTRIBUTION="wso2iot-@product.version@" +ALLPROF=0 +BINDIR=$(pwd) #get the desired profile echo "This tool will erase all the files which are not required for the selected profile " echo "and also creates a distribution of this profile in the same folder resides." @@ -34,9 +36,12 @@ echo " 3.IoT Device Backend Profile" echo " 4.IoT Device Manager Profile" echo " 5.Analytics Profile" echo " 6.Broker profile" +echo " 7.For All Profiles" echo "Please enter the desired profile number to create the profile specific distribution." read profileNumber +create_profile(){ +echo "Creating profile - "${profileNumber} if [ "$profileNumber" -lt 7 ] && [ "$profileNumber" -gt 0 ] ; then TEMPDIR=${DIR}/../../tmp @@ -53,7 +58,7 @@ fi #gateway profile if [ ${profileNumber} -eq 1 ] then - echo "Preparing the Integrator profile distribution" + echo "Preparing the IoT Gateway profile distribution" DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/http-gateway/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" #remove broker echo "Removing Broker profile" @@ -69,7 +74,7 @@ then rm -rf ${DIR}/analytics.bat rm -rf ${DIR}/analytics.sh - #remove integrator + #remove iot echo "Removing IoT Other profiles" rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-backend ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/device-manager rm -rf ${DIR}/../samples/ @@ -90,7 +95,7 @@ then #key-manager profile elif [ ${profileNumber} -eq 2 ] then - echo "Preparing the Integrator profile distribution" + echo "Preparing the IoT Keymanager profile distribution" DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/device-key-manager/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" #remove broker echo "Removing Broker profile" @@ -106,7 +111,7 @@ then rm -rf ${DIR}/analytics.bat rm -rf ${DIR}/analytics.sh - #remove integrator + #remove iot echo "Removing IoT Other profiles" rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-backend ${DIR}/../wso2/components/http-gateway ${DIR}/../wso2/components/device-manager rm -rf ${DIR}/../samples/ @@ -114,7 +119,7 @@ then rm -rf ${DIR}/profile-creator.sh rm -rf ${DIR}/profile-creator.bat cp -rf ${DIR}/../repository/resources/profiles/keymanager/*.sh ${DIR}/../bin/ - cp -rf ${DIR}/../repository/resources/profiles/gateway/carbon.xml ${DIR}/../conf/ + cp -rf ${DIR}/../repository/resources/profiles/keymanager/carbon.xml ${DIR}/../conf/ rm -rf ${DIR}/../repository/deployment/server/jaggeryapps/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/api/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/sequences/_*.xml @@ -134,7 +139,7 @@ then #device backend profile elif [ ${profileNumber} -eq 3 ] then - echo "Preparing the Integrator profile distribution" + echo "Preparing the IoT Device Backend profile distribution" DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/device-backend/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" #remove broker echo "Removing Broker profile" @@ -150,7 +155,7 @@ then rm -rf ${DIR}/analytics.bat rm -rf ${DIR}/analytics.sh - #remove integrator + #remove iot echo "Removing IoT Other profiles" rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/http-gateway ${DIR}/../wso2/components/device-manager rm -rf ${DIR}/../samples/ @@ -160,7 +165,7 @@ then rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/api/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/sequences/_*.xml cp -rf ${DIR}/../repository/resources/profiles/backend/*.sh ${DIR}/../bin/ - cp -rf ${DIR}/../repository/resources/profiles/gateway/carbon.xml ${DIR}/../conf/ + cp -rf ${DIR}/../repository/resources/profiles/backend/carbon.xml ${DIR}/../conf/ rm -rf ${DIR}/../repository/deployment/server/webapps/oauth2.war ${DIR}/../repository/deployment/server/webapps/shindig.war ${DIR}/../repository/deployment/server/webapps/api#am#publisher#v0.11.war ${DIR}/../repository/deployment/server/webapps/api#am#store#v0.11.war ${DIR}/../repository/deployment/server/webapps/api#appm#oauth#v1.0.war ${DIR}/../repository/deployment/server/webapps/api#appm#publisher#v1.1.war ${DIR}/../repository/deployment/server/webapps/api#appm#store#v1.1.war rm -rf ${DIR}/../repository/deployment/server/webapps/dynamic-client-web.war ${DIR}/../repository/deployment/server/webapps/client-registration#v0.11.war rm -rf ${DIR}/../repository/deployment/server/jaggeryapps/* @@ -172,7 +177,7 @@ then #device manager profile elif [ ${profileNumber} -eq 4 ] then - echo "Preparing the Integrator profile distribution" + echo "Preparing the IoT Device Manager profile distribution" DEFAULT_BUNDLES="$(< ${DIR}/../wso2/components/device-manager/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info)" #remove broker echo "Removing Broker profile" @@ -188,7 +193,7 @@ then rm -rf ${DIR}/analytics.bat rm -rf ${DIR}/analytics.sh - #remove integrator + #remove iot echo "Removing IoT Other profiles" rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/http-gateway ${DIR}/../wso2/components/device-backend rm -rf ${DIR}/../samples/ @@ -196,7 +201,7 @@ then rm -rf ${DIR}/profile-creator.sh rm -rf ${DIR}/profile-creator.bat cp -rf ${DIR}/../repository/resources/profiles/manager/*.sh ${DIR}/../bin/ - cp -rf ${DIR}/../repository/resources/profiles/gateway/carbon.xml ${DIR}/../conf/ + cp -rf ${DIR}/../repository/resources/profiles/manager/carbon.xml ${DIR}/../conf/ mkdir ${DIR}/../repository/deployment/server/tempwebapp cp ${DIR}/../repository/deployment/server/webapps/api#am#publisher#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ cp ${DIR}/../repository/deployment/server/webapps/api#am#store#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ @@ -258,7 +263,7 @@ then rm -rf ${DIR}/analytics.bat rm -rf ${DIR}/analytics.sh - #remove integrator + #remove iot echo "Removing IoT profiles" rm -rf ${DIR}/../conf rm -rf ${DIR}/../wso2/components/default ${DIR}/../wso2/components/device-backend ${DIR}/../wso2/components/device-key-manager ${DIR}/../wso2/components/device-manager ${DIR}/../wso2/components/http-gateway @@ -299,6 +304,21 @@ echo "Preparing a profile distribution archive." cd ${DIR}/../../ mv ${DISTRIBUTION} ${DISTRIBUTION}${PROFILE} zip -r ${DISTRIBUTION}${PROFILE}.zip ${DISTRIBUTION}${PROFILE}/ - +cd ${BINDIR} +DIR=${BINDIR} echo "Profile created successfully in "$(pwd)"/"${DISTRIBUTION}${PROFILE} +} + +if [ ${profileNumber} -eq 7 ]; then + profileNumber=1 + while [ "$profileNumber" -lt 7 ] + do + create_profile + ((profileNumber++)) + done + echo "All profiles are created successfully!" +else + create_profile +fi + exit 0 From 5ed7b60ae24c77b85f5aa03c669c9499d662090f Mon Sep 17 00:00:00 2001 From: sinthuja Date: Mon, 17 Apr 2017 16:23:36 +0530 Subject: [PATCH 6/7] Fixing SSO issue with keymanager profile. --- .../src/core/bin/profile-creator.sh | 2 + .../identity/application-authentication.xml | 161 ++++++++++++++++++ modules/p2-profile/iot-core-profile/pom.xml | 8 +- 3 files changed, 168 insertions(+), 3 deletions(-) create mode 100644 modules/distribution/src/core/resources/profiles/keymanager/identity/application-authentication.xml diff --git a/modules/distribution/src/core/bin/profile-creator.sh b/modules/distribution/src/core/bin/profile-creator.sh index 10fa3a91..4b98d665 100644 --- a/modules/distribution/src/core/bin/profile-creator.sh +++ b/modules/distribution/src/core/bin/profile-creator.sh @@ -120,6 +120,7 @@ then rm -rf ${DIR}/profile-creator.bat cp -rf ${DIR}/../repository/resources/profiles/keymanager/*.sh ${DIR}/../bin/ cp -rf ${DIR}/../repository/resources/profiles/keymanager/carbon.xml ${DIR}/../conf/ + cp -rf ${DIR}/../repository/resources/profiles/keymanager/identity/application-authentication.xml ${DIR}/../conf/identity/ rm -rf ${DIR}/../repository/deployment/server/jaggeryapps/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/api/* rm -rf ${DIR}/../repository/deployment/server/synapse-configs/default/sequences/_*.xml @@ -127,6 +128,7 @@ then cp ${DIR}/../repository/deployment/server/webapps/oauth2.war ${DIR}/../repository/deployment/server/tempwebapp/ cp ${DIR}/../repository/deployment/server/webapps/client-registration#v0.11.war ${DIR}/../repository/deployment/server/tempwebapp/ cp ${DIR}/../repository/deployment/server/webapps/dynamic-client-web.war ${DIR}/../repository/deployment/server/tempwebapp/ + cp ${DIR}/../repository/deployment/server/webapps/authenticationendpoint.war ${DIR}/../repository/deployment/server/tempwebapp/ rm -rf ${DIR}/../repository/deployment/server/webapps/* cp -rf ${DIR}/../repository/deployment/server/tempwebapp/* ${DIR}/../repository/deployment/server/webapps/ rm -rf ${DIR}/../repository/deployment/server/tempwebapp diff --git a/modules/distribution/src/core/resources/profiles/keymanager/identity/application-authentication.xml b/modules/distribution/src/core/resources/profiles/keymanager/identity/application-authentication.xml new file mode 100644 index 00000000..f242c3c1 --- /dev/null +++ b/modules/distribution/src/core/resources/profiles/keymanager/identity/application-authentication.xml @@ -0,0 +1,161 @@ + + + + + + + smart + + + /authenticationendpoint/login.do + + + + org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultRequestCoordinator + org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultAuthenticationRequestHandler + org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultLogoutRequestHandler + org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultStepBasedSequenceHandler + org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultRequestPathBasedSequenceHandler + org.wso2.carbon.identity.application.authentication.framework.handler.step.impl.DefaultStepHandler + org.wso2.carbon.identity.application.authentication.framework.handler.hrd.impl.DefaultHomeRealmDiscoverer + org.wso2.carbon.identity.application.authentication.framework.handler.claims.impl.DefaultClaimHandler + org.wso2.carbon.identity.application.authentication.framework.handler.provisioning.impl.DefaultProvisioningHandler + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /authenticationendpoint/login.do + /repository/resources/security/client-truststore.jks + wso2carbon + + + + https://accounts.google.com/o/oauth2/token + https://accounts.google.com/o/oauth2/auth + https://www.googleapis.com/oauth2/v3/userinfo + + + https://login.live.com/oauth20_token.srf + https://login.live.com/oauth20_authorize.srf + https://apis.live.net/v5.0/me?access_token= + + + https://graph.facebook.com/oauth/access_token + http://www.facebook.com/dialog/oauth + https://graph.facebook.com/me + + + /authenticationendpoint/fido-auth.jsp + + + https://api.login.yahoo.com/oauth2/get_token + https://api.login.yahoo.com/oauth2/request_auth + https://social.yahooapis.com/v1/user/ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 3792f4f3..2cfb7463 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -2105,9 +2105,7 @@ ${carbon.commons.version} - - org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group - + org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group ${identity.local.auth.basicauth.version} @@ -2475,6 +2473,10 @@ org.wso2.carbon.analytics.api.client.feature.group ${carbon.analytics.version} + + org.wso2.carbon.identity.sso.saml.feature.group + ${identity.inbound.auth.saml.version} + From 8fd14700c5e55e4f07c5ce7da9a1e50d39c1ce72 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Tue, 18 Apr 2017 12:11:29 +0530 Subject: [PATCH 7/7] Fixing https://github.com/wso2/product-iots/issues/363. --- modules/distribution/src/assembly/bin.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index f871c013..3cf301e7 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -650,7 +650,6 @@ **/.data **/.settings features/** - **/org.wso2.carbon.feature.mgt.ui* **/artifacts.xml **/json_2.0.0.wso2v1.jar **/nimbus-jose-jwt_2.26.1.wso2v2.jar @@ -918,7 +917,6 @@ **/.data **/.settings features/** - **/org.wso2.carbon.feature.mgt.ui* **/json_2.0.0.wso2v1.jar **/nimbus-jose-jwt_2.26.1.wso2v2.jar **/artifacts.xml @@ -1079,7 +1077,6 @@ **/.data **/.settings features/** - **/org.wso2.carbon.feature.mgt.ui* **/json_2.0.0.wso2v1.jar **/nimbus-jose-jwt_2.26.1.wso2v2.jar **/artifacts.xml