diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index dcc30a8..e8e68a2 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -30,7 +30,7 @@ io.entgra.community.uem.p2.profile pom Entgra UEM - P2 Profile Module - http://entgra.io + https://entgra.io @@ -62,7 +62,6 @@ org.wso2.maven carbon-p2-plugin - ${carbon.p2.plugin.version} 2-p2-repo-generation @@ -79,9 +78,6 @@ io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mobile.android.feature:${io.entgra.device.mgt.plugins.version} - - - @@ -102,10 +98,6 @@ io.entgra.device.mgt.plugins.mobile.android.feature.group ${io.entgra.device.mgt.plugins.version} - - - - @@ -114,7 +106,6 @@ com.google.code.maven-replacer-plugin replacer - 1.5.3 package diff --git a/pom.xml b/pom.xml index ec6e1ea..d8edc38 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ pom 5.2.2-SNAPSHOT Entgra Community Product - Parent - http://entgra.io + https://entgra.io Entgra Community Product @@ -53,7 +53,7 @@ org.wso2.orbit.com.h2database h2 - ${orbit.h2.engine.version} + ${orbit.h2.version} @@ -61,250 +61,6 @@ io.entgra.community.uem.core ${project.version} - - org.wso2.carbon.automation - org.wso2.carbon.automation.engine - ${platform.integration.utils.version} - - - org.slf4j - slf4j-api - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - test - - - org.wso2.carbon.automation - org.wso2.carbon.automation.test.utils - ${test.framework.version} - - - org.slf4j - slf4j-api - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - test - - - org.wso2.carbon.automationutils - org.wso2.carbon.integration.common.utils - ${test.framework.version} - - - org.slf4j - slf4j-api - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - test - - - org.wso2.carbon.automation - org.wso2.carbon.automation.extensions - ${platform.integration.utils.version} - - - org.slf4j - slf4j-api - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.apache.ftpserver - ftpserver-core - - - org.apache.activemq - activemq-all - - - org.apache.tomcat.embed - tomcat-embed-core - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - - - org.springframework.ws.wso2 - spring.framework - - - org.apache.cxf - cxf-rt-frontend-jaxrs - - - org.seleniumhq.selenium - selenium-java - - - com.opera - operadriver - - - com.saucelabs.selenium - sauce-ondemand-driver - - - com.saucelabs.selenium - selenium-client-factory - - - org.apache.axis2.wso2 - axis2 - - - org.apache.ws.commons.axiom.wso2 - axiom - - - net.lingala.zip4j - zip4j - - - test - - - org.wso2.carbon.automationutils - org.wso2.carbon.integration.common.extensions - ${automation.utils.version} - test - - - org.slf4j - slf4j-api - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.apache.ftpserver - ftpserver-core - - - org.apache.activemq - activemq-all - - - org.apache.tomcat.embed - tomcat-embed-core - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - - - org.springframework.ws.wso2 - spring.framework - - - org.apache.cxf - cxf-rt-frontend-jaxrs - - - org.seleniumhq.selenium - selenium-java - - - com.opera - operadriver - - - org.apache.jmeter - ApacheJMeter_core - - - com.saucelabs.selenium - sauce-ondemand-driver - - - com.saucelabs.selenium - selenium-client-factory - - - org.apache.axis2.wso2 - axis2 - - - org.apache.ws.commons.axiom.wso2 - axiom - - - net.lingala.zip4j - zip4j - - - - - org.wso2.carbon.automationutils - org.wso2.carbon.integration.common.admin.client - ${automation.utils.version} - test - - - org.slf4j - slf4j-api - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.wso2.carbon.commons - org.wso2.carbon.user.mgt.stub - - - org.wso2.carbon.commons - org.wso2.carbon.ndatasource.stub - - - org.wso2.carbon.commons - org.wso2.carbon.authenticator.stub - - - org.wso2.carbon - org.wso2.carbon.utils - - - com.google.code.gson gson @@ -315,8 +71,8 @@ - 4.0.0 - wso2am-4.0.0 + 4.2.0 + wso2am-4.2.0 io.entgra.community.uem.core-${project.version} entgra-uem-community-${project.version} @@ -324,19 +80,15 @@ 5.0.26-SNAPSHOT - 5.1.2 + 5.2.42 - 1.4.199.wso2v1 + 2.1.210.wso2v1 6.0.17-SNAPSHOT - 2.8.5 - 4.4.3 - 4.4.2 - 4.4.2 - + 2.9.1 @@ -371,11 +123,11 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.1 + 3.8.1 UTF-8 - 1.8 - 1.8 + 11 + 11 @@ -397,19 +149,11 @@ org.apache.felix maven-scr-plugin 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - org.apache.felix maven-bundle-plugin - 2.3.5 + 5.1.1 true NONE @@ -450,12 +194,22 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 + 2.22.0 true + + org.wso2.maven + carbon-p2-plugin + ${carbon.p2.plugin.version} + + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + diff --git a/uem-core/pom.xml b/uem-core/pom.xml index fa10e7d..ab58488 100644 --- a/uem-core/pom.xml +++ b/uem-core/pom.xml @@ -52,7 +52,6 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 extract-pack @@ -68,7 +67,7 @@ ${wso2am-nexus-artifact-version} zip true - ${project.basedir}/target/wso2am-${wso2am-nexus-artifact-version} + ${project.basedir}/target wso2am-${wso2am-nexus-artifact-version} @@ -254,7 +253,6 @@ org.wso2.maven carbon-p2-plugin - ${carbon.p2.plugin.version} 2-p2-repo-generation @@ -263,6 +261,7 @@ p2-repo-gen + ${basedir}/target/p2-agent file:${basedir}/target/p2-repo file:${basedir}/target/p2-repo true @@ -582,7 +581,6 @@ com.google.code.maven-replacer-plugin replacer - 1.5.3 package diff --git a/uem-core/src/assembly/bin.xml b/uem-core/src/assembly/bin.xml index daa8903..38bbf11 100644 --- a/uem-core/src/assembly/bin.xml +++ b/uem-core/src/assembly/bin.xml @@ -88,14 +88,6 @@ src/core/conf/deployment.toml ${entgra-uem-core}/repository/conf/ - - src/core/conf/input-event-adapters.xml - ${entgra-uem-core}/repository/conf/ - - - src/core/conf/output-event-adapters.xml.j2 - ${entgra-uem-core}/repository/resources/conf/templates/repository/conf - src/core/keystores/wso2carbon.jks ${entgra-uem-core}/repository/resources/security/ @@ -111,11 +103,10 @@ ${entgra-uem-core}/repository/components/dropins io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.oauth.extensions - io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.keymgt.extension - - - + false + true + false diff --git a/uem-core/src/core/bin/iot-server.bat b/uem-core/src/core/bin/iot-server.bat index 2bee15e..1149f02 100755 --- a/uem-core/src/core/bin/iot-server.bat +++ b/uem-core/src/core/bin/iot-server.bat @@ -172,13 +172,13 @@ set CMD=RUN %* :checkJdk17 PATH %PATH%;%JAVA_HOME%\bin\ for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "JAVA_VERSION=%%j%%k" -if %JAVA_VERSION% LSS 17 goto unknownJdk -if %JAVA_VERSION% GTR 110 goto unknownJdk +if %JAVA_VERSION% LSS 110 goto unknownJdk +if %JAVA_VERSION% GTR 170 goto unknownJdk goto jdk17 :unknownJdk echo Starting WSO2 Carbon (in unsupported JDK) -echo [ERROR] CARBON is supported only on JDK 1.7, 1.8, 9, 10 and 11 +echo [ERROR] CARBON is supported only between JDK 11 and JDK 17 goto jdk17 :jdk17 @@ -203,7 +203,7 @@ set CARBON_CLASSPATH=".\lib\*";%CARBON_CLASSPATH% if %JAVA_VERSION% GEQ 110 set CARBON_CLASSPATH=".\lib\endorsed\*";%CARBON_CLASSPATH% if %JAVA_VERSION% LEQ 18 set JAVA_VER_BASED_OPTS=-Djava.endorsed.dirs=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed" -if %JAVA_VERSION% GEQ 110 set JAVA_VER_BASED_OPTS=--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED +if %JAVA_VERSION% GEQ 110 set JAVA_VER_BASED_OPTS=--add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% %JAVA_VER_BASED_OPTS% @@ -217,6 +217,9 @@ set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dcom.atomikos.icatch.hide_init_file_path="tru set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -DworkerNode=false -Dcarbon.new.config.dir.path="%CARBON_HOME%\repository\resources\conf" set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Dhttpclient.hostnameVerifier="DefaultAndLocalhost" +set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dlog4j2.contextSelector="org.apache.logging.log4j.core.async.AsyncLoggerContextSelector" +set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.ops4j.pax.logging.logReaderEnabled="false" +set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.ops4j.pax.logging.eventAdminEnabled="false" set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.core.http.port="9763" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.gateway.carbon.https.port="9443" -Diot.gateway.carbon.http.port="9763" -Diot.gateway.websocket.ws.port="9099" -Diot.gateway.websocket.wss.port="8099" -Diot.remotesession.server.host="localhost" -Diot.remotesession.server.https.port="9443" set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1883" diff --git a/uem-core/src/core/bin/iot-server.sh b/uem-core/src/core/bin/iot-server.sh index 238ba73..6854e2d 100755 --- a/uem-core/src/core/bin/iot-server.sh +++ b/uem-core/src/core/bin/iot-server.sh @@ -235,9 +235,9 @@ fi # ---------- Handle the SSL Issue with proper JDK version -------------------- java_version=$("$JAVACMD" -version 2>&1 | awk -F '"' '/version/ {print $2}') java_version_formatted=$(echo "$java_version" | awk -F. '{printf("%02d%02d",$1,$2);}') -if [ $java_version_formatted -lt 0107 ] || [ $java_version_formatted -gt 1100 ]; then +if [ $java_version_formatted -lt 1100 ] || [ $java_version_formatted -gt 1700 ]; then echo " Starting WSO2 Carbon (in unsupported JDK)" - echo " [ERROR] CARBON is supported only on JDK 1.7, 1.8, 9, 10 and 11" + echo " [ERROR] CARBON is supported only between JDK 11 and JDK 17" fi CARBON_XBOOTCLASSPATH="" @@ -307,11 +307,10 @@ echo "Using Java memory options: $JVM_MEM_OPTS" #To monitor a Carbon server in remote JMX mode on linux host machines, set the below system property. # -Djava.rmi.server.hostname="your.IP.goes.here" -JAVA_VER_BASED_OPTS="" +JAVA_VER_BASED_OPTS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED" - -if [ $java_version_formatted -ge 1100 ]; then - JAVA_VER_BASED_OPTS="--add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED" +if [ $java_version_formatted -ge 1700 ]; then + JAVA_VER_BASED_OPTS="$JAVA_VER_BASED_OPTS --add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED" fi while [ "$status" = "$START_EXIT_STATUS" ] @@ -354,6 +353,9 @@ do -DenableCorrelationLogs=false \ -Dcarbon.new.config.dir.path="$CARBON_HOME/repository/resources/conf" \ -Djavax.xml.xpath.XPathFactory:http://java.sun.com/jaxp/xpath/dom=net.sf.saxon.xpath.XPathFactoryImpl \ + -Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector \ + -Dorg.ops4j.pax.logging.logReaderEnabled=false \ + -Dorg.ops4j.pax.logging.eventAdminEnabled=false \ -Diot.core.host="localhost" \ -Diot.core.https.port="9443" \ -Diot.core.http.port="9763" \ @@ -378,4 +380,4 @@ do -Diot.reporting.webapp.host="" \ org.wso2.carbon.bootstrap.Bootstrap $* status=$? -done +done \ No newline at end of file diff --git a/uem-core/src/core/conf/deployment.toml b/uem-core/src/core/conf/deployment.toml index 15f4538..02d0069 100644 --- a/uem-core/src/core/conf/deployment.toml +++ b/uem-core/src/core/conf/deployment.toml @@ -6,7 +6,7 @@ base_path = "${carbon.protocol}://${carbon.host}:${carbon.management.port}" server_role = "default" [database_configuration] -enable_h2_console = "true" +enable_h2_console = true [super_admin] username = "admin" @@ -38,6 +38,9 @@ key_password = "wso2carbon" [identity_mgt.endpoint] enable_self_signup_endpoint = false +#[keystore.listener_profile] +#bind_address = "0.0.0.0" + #[keystore.primary] #file_name = "wso2carbon.jks" #type = "JKS" @@ -55,6 +58,7 @@ enable_self_signup_endpoint = false [[apim.gateway.environment]] name = "Default" type = "hybrid" +provider = "wso2" display_in_api_console = true description = "This is a hybrid gateway that handles both production and sandbox token traffic." show_as_token_endpoint_url = true @@ -101,13 +105,10 @@ gateway_labels =["Default"] [apim.analytics] enable = false -config_endpoint = "https://localhost:8080/auth/v1" auth_token = "" -[web_app.listener] -class_name = ["io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"] - [apim.key_manager] +enable_apikey_subscription_validation = true #service_url = "https://localhost:${mgt.transport.https.port}/services/" #username = "$ref{super_admin.username}" #password = "$ref{super_admin.password}" @@ -260,6 +261,14 @@ username = "${admin.username}" password = "${admin.password}" 'header.X-WSO2-KEY-MANAGER' = "default" +[web_app.listener] +class_name = ["io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"] + +[oauth.grant_type.token_exchange] +enable = true +allow_refresh_tokens = true +iat_validity_period = "1h" + [apim.sync_runtime_artifacts.gateway.skip_list] apis = ["_TokenAPI_.xml", "_API_Key_Management_.xml", "health-check.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml", "admin--IOS-Enrollment.xml", "admin--IOS-Enrollment-Authenticate-Agent.xml", "admin--IOS-Enrollment-Profile.xml", "admin--IOS-Enrollment-Profile-DEP.xml", "admin--IOS-Enrollment-Scep.xml", "admin--Windows_8.1_Device_Management_Service.xml", "admin--Windows_8.1_Device_Management_Service_v1.0.0.xml", "admin--Windows_8.1_Enrollment_Service.xml", "admin--Windows_8.1_Enrollment_Service_v1.0.0.xml", "admin--Windows_10_Device_management.xml", "admin--Windows_10_Device_management_v1.0.0.xml", "admin--Windows_10_Enrollment_Service.xml", "admin--Windows_10_Enrollment_Service_v1.0.0.xml", "admin--Windows_Discovery_Service.xml", "admin--Windows_Discovery_Service_v1.0.0.xml", "admin--Windows_Enrollment_policy_Service.xml", "admin--Windows_Enrollment_policy_Service_v1.0.0.xml"] sequences = ["_api_registration_fault_.xml"] @@ -282,4 +291,4 @@ grant_validator="io.entgra.device.mgt.core.device.mgt.oauth.extensions.validator renew_refresh_token=false [device_mgt_conf.pull_notification_conf] -enabled=false \ No newline at end of file +enabled=false diff --git a/uem-core/src/core/conf/input-event-adapters.xml b/uem-core/src/core/conf/input-event-adapters.xml deleted file mode 100644 index 25052b2..0000000 --- a/uem-core/src/core/conf/input-event-adapters.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - 8 - 100 - 20000 - 10000 - 60 - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register - tcp://${mqtt.broker.host}:${mqtt.broker.port} - admin - admin - deviceid-topic-content-validator - true - - - - 8 - 100 - 20000 - 10000 - - - - false - - - - readMails - - - - 20000 - 10000 - - - \ No newline at end of file diff --git a/uem-core/src/core/conf/output-event-adapters.xml.j2 b/uem-core/src/core/conf/output-event-adapters.xml.j2 deleted file mode 100644 index 883a6d6..0000000 --- a/uem-core/src/core/conf/output-event-adapters.xml.j2 +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - tcp://localhost:7612 - ssl://localhost:7712 - tcp://localhost:9612 - ssl://localhost:9712 - - - - VARCHAR(255) - DOUBLE - INT - BIGINT - FLOAT - BOOL - CREATE TABLE $TABLE_NAME ($COLUMN_TYPES) - INSERT INTO $TABLE_NAME ($COLUMNS) VALUES ($VALUES) - SELECT * FROM $TABLE_NAME limit 1 - UPDATE $TABLE_NAME SET $COLUMN_VALUES WHERE $CONDITION - , - ? - = - AND - SELECT COLUMN_NAME, DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '$TABLE_NAME' - SELECT $COLUMNS FROM $TABLE_NAME - varchar2(255) - CLOB - BINARY_DOUBLE - SELECT * FROM $TABLE_NAME WHERE ROWNUM = 1 - SELECT COLUMN_NAME, DATA_TYPE FROM USER_TAB_COLS WHERE TABLE_NAME = '$TABLE_NAME' - varchar2(255) - SELECT TOP 1 * FROM $TABLE_NAME - SELECT COLUMN_NAME, DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '$TABLE_NAME' - varchar2(255) - REAL - SHOW COLUMNS FROM $TABLE_NAME - - - - - 8 - 100 - 20000 - 10000 - - 50 - 1000 - - - - - {{output_adapter.jms.min_thread}} - {{output_adapter.jms.max_thread}} - {{output_adapter.jms.keep_alive_time}} - {{output_adapter.jms.job_queue_size}} - - - - - 8 - 100 - 20000 - 10000 - 60 - - - - - 8 - 100 - 20000 - 10000 - - - - - {{output_adapter.email.from_address}} - {{output_adapter.email.username}} - {{output_adapter.email.password}} - {{output_adapter.email.hostname}} - {{output_adapter.email.port}} - {{output_adapter.email.enable_start_tls}} - {{output_adapter.email.enable_authentication}} - {{output_adapter.email.signature}} - {{output_adapter.email.reply_to}} - {% if output_adapter.email.custom_properties is defined %} - - {% for property_name,property_value in output_adapter.email.custom_properties.items() %} - {{property_value}} - {% endfor %} - {% endif %} - - 8 - 100 - 20000 - 10000 - - - - 30 - - 8 - 100 - 20000 - 10000 - - - - - 8 - 100 - 20000 - 10000 - - - - - 8 - 100 - 20000 - 10000 - - - - - 8 - 100 - 20000 - 10000 - - 10000 - true - true - 50 - - - - - 8 - 100 - 20000 - 10000 - 60 - https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register - https://${iot.gateway.host}:${iot.gateway.https.port}/token - tcp://${mqtt.broker.host}:${mqtt.broker.port} - admin - admin - 2 - true - - - \ No newline at end of file