From 08bc742c4d48530f52f58ce6c5a3efe56e914024 Mon Sep 17 00:00:00 2001 From: sinthuja Date: Thu, 9 Mar 2017 17:55:37 +0530 Subject: [PATCH] Fixing the startup issues in the core profile. --- .../src/analytics/bin/load-spark-env-vars.sh | 2 +- .../src/analytics/bin/wso2server.sh | 20 +- .../src/analytics/conf/carbon.xml | 4 +- modules/distribution/src/assembly/bin.xml | 271 ++++++++---------- modules/distribution/src/assembly/dist.xml | 6 + .../src/assembly/filter.properties | 3 +- .../distribution/src/core/bin/wso2server.sh | 1 - modules/distribution/src/core/conf/carbon.xml | 4 +- .../application-authenticators.xml | 0 .../core/conf/tomcat/carbon/WEB-INF/web.xml | 29 +- .../src/core/conf/tomcat/catalina-server.xml | 1 - .../src/core/conf/tomcat/context.xml | 2 +- .../webapp-classloading-environments.xml | 77 +++++ modules/p2-profile/iot-core-profile/pom.xml | 23 ++ pom.xml | 15 +- 15 files changed, 276 insertions(+), 182 deletions(-) rename modules/distribution/src/core/conf/{ => security}/application-authenticators.xml (100%) create mode 100644 modules/distribution/src/core/conf/tomcat/webapp-classloading-environments.xml diff --git a/modules/distribution/src/analytics/bin/load-spark-env-vars.sh b/modules/distribution/src/analytics/bin/load-spark-env-vars.sh index a9206c38..51a8d2fd 100755 --- a/modules/distribution/src/analytics/bin/load-spark-env-vars.sh +++ b/modules/distribution/src/analytics/bin/load-spark-env-vars.sh @@ -3,7 +3,7 @@ echo 'Loading spark environment variables ' export CARBON_SPARK_HOME=$CARBON_HOME -export _SPARK_ASSEMBLY=$CARBON_SPARK_HOME/repository/components/plugins/spark-core_2.10_*.wso2*.jar +export _SPARK_ASSEMBLY=$CARBON_SPARK_HOME/components/plugins/spark-core_2.10_*.wso2*.jar export SPARK_SCALA_VERSION=2.10 # *** jars will be added to the spark classpath in the code itself. check DAS-105 # export SPARK_CLASSPATH=`java -cp $CARBON_SPARK_HOME/repository/components/plugins/org.wso2.carbon.analytics.spark.utils*.jar org.wso2.carbon.analytics.spark.utils.ComputeClasspath $CARBON_HOME` diff --git a/modules/distribution/src/analytics/bin/wso2server.sh b/modules/distribution/src/analytics/bin/wso2server.sh index 1315b4f2..888ab338 100755 --- a/modules/distribution/src/analytics/bin/wso2server.sh +++ b/modules/distribution/src/analytics/bin/wso2server.sh @@ -300,18 +300,26 @@ do -classpath "$CARBON_CLASSPATH" \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ -Djava.io.tmpdir="$CARBON_HOME/tmp" \ - -Dcatalina.base="$CARBON_HOME/lib/tomcat" \ + -Dcatalina.base="$CARBON_HOME/../lib/tomcat" \ -Dwso2.server.standalone=true \ -Dcarbon.registry.root=/ \ -Djava.command="$JAVACMD" \ -Dcarbon.home="$CARBON_HOME" \ -Dlogger.server.name="IoT-Analytics" \ -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \ - -Dcarbon.config.dir.path="$CARBON_HOME/repository/conf" \ - -Djava.util.logging.config.file="$CARBON_HOME/repository/conf/etc/logging-bridge.properties" \ - -Dcomponents.repo="$CARBON_HOME/repository/components/plugins" \ - -Dconf.location="$CARBON_HOME/repository/conf"\ - -Dcom.atomikos.icatch.file="$CARBON_HOME/lib/transactions.properties" \ + -Dcarbon.config.dir.path="$CARBON_HOME/conf" \ + -Dcarbon.repository.dir.path="$CARBON_HOME/repository" \ + -Dcarbon.components.dir.path="$CARBON_HOME/../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/../lib" \ + -Djava.util.logging.config.file="$CARBON_HOME/conf/etc/logging-bridge.properties" \ + -Dcomponents.repo="$CARBON_HOME/../components/plugins" \ + -Dconf.location="$CARBON_HOME/conf" \ + -Dcom.atomikos.icatch.file="$CARBON_HOME/../lib/transactions.properties" \ -Dcom.atomikos.icatch.hide_init_file_path=true \ -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false \ -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true \ diff --git a/modules/distribution/src/analytics/conf/carbon.xml b/modules/distribution/src/analytics/conf/carbon.xml index f2e3ab82..a23e7ff3 100644 --- a/modules/distribution/src/analytics/conf/carbon.xml +++ b/modules/distribution/src/analytics/conf/carbon.xml @@ -308,7 +308,7 @@ 3. file:///home/carbon/repository/axis2.xml 4. http://repository/conf/axis2.xml --> - ${carbon.home}/repository/conf/axis2/axis2.xml + ${carbon.home}/conf/axis2/axis2.xml - ${carbon.home}/repository/conf/axis2/axis2_client.xml + ${carbon.home}/conf/axis2/axis2_client.xml true diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index da380eb5..3e899f8e 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -124,16 +124,48 @@ - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/ ${pom.artifactId}-${pom.version}/conf/ - - **/* - + + **/api-manager.xml + **/sso-idp-config.xml + **/application-authentication.xml + **/log4j.properties + **/nhttp.properties + **/passthru-http.properties + **/user-mgt.xml + **/master-datasources.xml + **/cdm-datasources.xml + **/tomcat/carbon/WEB-INF/web.xml + **/synapse.properties + **/etc/device-analytics-config.xml + **/synapse-handlers.xml + **/tomcat/context.xml + **/security/Owasp.CsrfGuard.Carbon.properties + **/security/Owasp.CsrfGuard.dashboard.properties + **/security/application-authenticators.xml + **/identity/application-authentication.xml + **/identity/identity-providers/iot_default.xml + **/identity/sso-idp-config.xml + **/api-manager.xml + **/app-manager.xml + **/etc/license-config.xml + **/registry.xml + **/carbon.xml + **/axis2/axis2.xml + **/etc/launch.ini + **/security/authenticators.xml + **/analytics/analytics-data-config.xml + **/identity/identity-providers/iot_default.xml + **/log4j.properties + **/etc/webapp-publisher-config.xml + **/tomcat/webapp-classloading-environments.xml + **/tomcat/catalina-server.xml + true @@ -164,7 +196,7 @@ ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/modules - ${pom.artifactId}-${pom.version}/wso2/modules/ + ${pom.artifactId}-${pom.version}/modules/ **/carbon/ **/jaggery-test/ @@ -209,25 +241,19 @@ - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/datasources + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources - ${pom.artifactId}-${pom.version}/conf/datasources - - - */** - - - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/device-types - - ${pom.artifactId}-${pom.version}/conf/device-types - - - */** - + ${pom.artifactId}-${pom.version}/repository/resources + + **/dbscripts/** + **/lifecycles/** + **/styles/** + **/synapse-configs/** + **/web-apps/** + **/appm-tenant-conf.xml + + src/core/resources ${pom.artifactId}-${pom.version}/repository/resources @@ -236,7 +262,6 @@ - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/ @@ -249,14 +274,14 @@ ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/modules - ${pom.artifactId}-${pom.version}/wso2/modules/ + ${pom.artifactId}-${pom.version}/modules/ */** src/core/modules - ${pom.artifactId}-${pom.version}/wso2/modules + ${pom.artifactId}-${pom.version}/modules */** @@ -279,7 +304,7 @@ - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/devicetypes + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/devicetypes ${pom.artifactId}-${pom.version}/repository/deployment/server/devicetypes @@ -288,7 +313,7 @@ - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt/ + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/devicemgt/ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt @@ -296,7 +321,7 @@ - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt-cdmf/ + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/devicemgt-cdmf/ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt @@ -304,7 +329,7 @@ - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/uuf-template-app/ + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/uuf-template-app/ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt @@ -314,7 +339,7 @@ - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/windows-web-agent/ + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/windows-web-agent ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/windows-web-agent @@ -323,30 +348,11 @@ **/jaggery.conf - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/uuf-template-app/ - - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/windows-web-agent - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/android-web-agent/ - - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/android-web-agent - - - **/jaggery.conf - - - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/uuf-template-app/ + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/android-web-agent/ ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/android-web-agent @@ -358,7 +364,7 @@ - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/ + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/webapps/ ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/ @@ -421,6 +427,17 @@ + + + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/social/ + + ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social + + + **/jaggery.conf + + + @@ -447,17 +464,6 @@ - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/social/ - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social - - - **/jaggery.conf - - - src/core/api-resources/synapse-configs/default/sequences ${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/ @@ -487,21 +493,6 @@ - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity - - ${pom.artifactId}-${pom.version}/conf/identity - - - **/saml1-assertion-config - **/msg-mgt.properties - **/entitlement.properties - **/EndpointConfig.properties - **/identity.xml - **/thrift-authentication.xml - - src/core/conf/identity/service-providers ${pom.artifactId}-${pom.version}/conf/identity/service-providers @@ -509,30 +500,6 @@ */** - - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity/identity-providers - - - ${pom.artifactId}-${pom.version}/conf/identity/identity-providers - - - **/default.xml - - - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity/service-providers - - - ${pom.artifactId}-${pom.version}/conf/identity/service-providers - - - **/default.xml - - - @@ -553,10 +520,10 @@ - src/core/jaggeryapps/portal/themes + src/core/jaggeryapps/portal/themes/analytics - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/extensions/themes + ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/extensions/themes/analytics **/* @@ -700,6 +667,12 @@ ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/bin ${pom.artifactId}-${pom.version}/wso2/analytics/bin + + **/wso2server.sh + **/wso2server.bat + **/load-spark-env-vars.sh + **/load-spark-env-vars.bat + @@ -803,7 +776,8 @@ ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/carbonapps/ - ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/carbonapps/ + ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/carbonapps/ + @@ -841,6 +815,10 @@ ${pom.artifactId}-${pom.version}/conf/tomcat/carbon/WEB-INF 755 + + src/core/conf/tomcat/webapp-classloading-environments.xml + ${pom.artifactId}-${pom.version}/conf/tomcat + src/core/bin/wso2server.sh @@ -913,6 +891,12 @@ true 644 + + src/core/conf/tomcat/catalina-server.xml + ${pom.artifactId}-${pom.version}/conf/tomcat + true + 644 + src/core/conf/security/Owasp.CsrfGuard.Carbon.properties @@ -922,22 +906,6 @@ src/core/conf/security/Owasp.CsrfGuard.dashboard.properties ${pom.artifactId}-${pom.version}/conf/security - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/event-broker.xml - - ${pom.artifactId}-${pom.version}/conf/ - true - 644 - - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/registry-event-broker.xml - - ${pom.artifactId}-${pom.version}/conf/ - true - 644 - src/core/INSTALL.txt ${pom.artifactId}-${pom.version} @@ -974,18 +942,9 @@ true 644 - - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/etc/logging-config.xml - - ${pom.artifactId}-${pom.version}/conf/etc - true - 644 - - src/core/conf/application-authenticators.xml + src/core/conf/security/application-authenticators.xml ${pom.artifactId}-${pom.version}/conf/security/ true @@ -997,14 +956,6 @@ true 644 - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity/oidc-scope-config.xml - - ${pom.artifactId}-${pom.version}/conf/identity/ - true - 644 - src/core/conf/identity/application-authentication.xml ${pom.artifactId}-${pom.version}/conf/identity @@ -1025,22 +976,6 @@ ${pom.artifactId}-${pom.version}/conf/identity 644 - - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml - - ${pom.artifactId}-${pom.version}/conf - 644 - - - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/apim-integration.xml - - ${pom.artifactId}-${pom.version}/conf - 644 - src/core/conf/api-manager.xml @@ -1340,6 +1275,22 @@ ${pom.artifactId}-${pom.version}/dropins + + + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml + + + ${pom.artifactId}-${pom.version}/conf/ + + + + + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/entitlement.properties + + + ${pom.artifactId}-${pom.version}/conf/identity + + @@ -1461,7 +1412,8 @@ src/analytics/jaggeryapps/portal/designer.json - ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/jaggeryapps/portal/configs/ + + ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/jaggeryapps/portal/configs/ true 644 @@ -1484,14 +1436,16 @@ src/analytics/resources/geodashboard/events.csv - ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventsimulatorfiles/ + + ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventsimulatorfiles/ true 644 src/analytics/resources/geodashboard/events_streamConfiguration.xml - ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventsimulatorfiles/ + + ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventsimulatorfiles/ true 644 @@ -1509,7 +1463,8 @@ ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/devicetypes/device_management/org_wso2_carbon_analytics_cdmf-1.0.0.car - ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/carbonapps/ + ${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/carbonapps/ + 644 diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml index 54deb319..e27c8137 100644 --- a/modules/distribution/src/assembly/dist.xml +++ b/modules/distribution/src/assembly/dist.xml @@ -33,6 +33,7 @@ **/*.lock **/.data **/.settings + features/** **/org.wso2.carbon.feature.mgt.ui* @@ -46,8 +47,13 @@ **/*.lock **/.data **/.settings + features/** **/org.wso2.carbon.feature.mgt.ui* + + plugins/** + + diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties index 4a97a77f..41ed4b3b 100644 --- a/modules/distribution/src/assembly/filter.properties +++ b/modules/distribution/src/assembly/filter.properties @@ -18,9 +18,8 @@ product.name=WSO2 IoT Server product.key=IoT -product.version=6.0.0 +product.version=3.1.0 carbon.version=4.4.14 -ei.version=3.1.0 default.server.role=IoTServer bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator diff --git a/modules/distribution/src/core/bin/wso2server.sh b/modules/distribution/src/core/bin/wso2server.sh index b46e3e42..d91c09e5 100755 --- a/modules/distribution/src/core/bin/wso2server.sh +++ b/modules/distribution/src/core/bin/wso2server.sh @@ -292,7 +292,6 @@ do -Dcarbon.config.dir.path="$CARBON_HOME/conf" \ -Dcarbon.components.dir.path="$CARBON_HOME/wso2/components" \ -Dcarbon.dropins.dir.path="$CARBON_HOME/dropins" \ - -Dtomcat.random.port.enable=true \ -Dcarbon.external.lib.dir.path="$CARBON_HOME/lib" \ -Dcarbon.patches.dir.path="$CARBON_HOME/patches" \ -Dcarbon.servicepacks.dir.path="$CARBON_HOME/servicepacks" \ diff --git a/modules/distribution/src/core/conf/carbon.xml b/modules/distribution/src/core/conf/carbon.xml index 40345945..8d79c7cb 100644 --- a/modules/distribution/src/core/conf/carbon.xml +++ b/modules/distribution/src/core/conf/carbon.xml @@ -302,7 +302,7 @@ 3. file:///home/carbon/repository/axis2.xml 4. http://repository/conf/axis2.xml --> - ${carbon.home}/repository/conf/axis2/axis2.xml + ${carbon.home}/conf/axis2/axis2.xml - ${carbon.home}/repository/conf/axis2/axis2_client.xml + ${carbon.home}/conf/axis2/axis2_client.xml true diff --git a/modules/distribution/src/core/conf/application-authenticators.xml b/modules/distribution/src/core/conf/security/application-authenticators.xml similarity index 100% rename from modules/distribution/src/core/conf/application-authenticators.xml rename to modules/distribution/src/core/conf/security/application-authenticators.xml diff --git a/modules/distribution/src/core/conf/tomcat/carbon/WEB-INF/web.xml b/modules/distribution/src/core/conf/tomcat/carbon/WEB-INF/web.xml index fffa6b5c..02e78c06 100755 --- a/modules/distribution/src/core/conf/tomcat/carbon/WEB-INF/web.xml +++ b/modules/distribution/src/core/conf/tomcat/carbon/WEB-INF/web.xml @@ -23,7 +23,7 @@ Owasp.CsrfGuard.Config - repository/conf/security/Owasp.CsrfGuard.Carbon.properties + conf/security/Owasp.CsrfGuard.Carbon.properties bridgeservlet @@ -61,6 +61,20 @@ UTF-8 + + + + + CRLFPreventionFilter + org.wso2.carbon.ui.filters.CRLFPreventionFilter + + + + + CSRFPreventionFilter + org.wso2.carbon.ui.filters.CSRFPreventionFilter + + CSRFGuard @@ -112,6 +126,19 @@ CharsetFilter /* + + + + CRLFPreventionFilter + /* + + + + + CSRFPreventionFilter + /* + + CSRFGuard /* diff --git a/modules/distribution/src/core/conf/tomcat/catalina-server.xml b/modules/distribution/src/core/conf/tomcat/catalina-server.xml index c68a93ef..fdc212f2 100644 --- a/modules/distribution/src/core/conf/tomcat/catalina-server.xml +++ b/modules/distribution/src/core/conf/tomcat/catalina-server.xml @@ -53,7 +53,6 @@ - + diff --git a/modules/distribution/src/core/conf/tomcat/webapp-classloading-environments.xml b/modules/distribution/src/core/conf/tomcat/webapp-classloading-environments.xml new file mode 100644 index 00000000..d1f5ecc0 --- /dev/null +++ b/modules/distribution/src/core/conf/tomcat/webapp-classloading-environments.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + Tomcat + javax.annotation.*,javax.ejb,javax.el,javax.persistence,javax.servlet.*,javax.xml,javax.xml.ws,org.apache.catalina.*,org.apache.coyote.*,org.apache.el.*,org.apache.jasper.*,org.apache.naming.*,org.apache.tomcat.*,com.sun.el.*,org.wso2.carbon.tomcat.jndi.* + *,!META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin,!META-INF/openwebbeans/openwebbeans.properties,!META-INF/standard-faces-config.xml,!META-INF/faces-config.xml + + + + Carbon + *,!org.springframework.*,!org.apache.solr.* + *,!META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin,!META-INF/openwebbeans/openwebbeans.properties,!META-INF/standard-faces-config.xml,!META-INF/faces-config.xml + + + + Javaee + *,!org.springframework.* + * + + + + + + + + + + + + + + CXF + ${carbon.home}/wso2/lib/runtimes/cxf/*.jar;${carbon.home}/wso2/lib/runtimes/cxf/ + + + + diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index c4604128..dff4f564 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -586,6 +586,9 @@ org.wso2.carbon.identity.framework:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.framework.version.iotcore} + + org.wso2.carbon.identity.application.authz.xacml:org.wso2.carbon.identity.application.authz.xacml.server.feature:${identity.application.authz.xacml} + @@ -1196,6 +1199,10 @@ ${carbon.identity.framework.version.iotcore} + + org.wso2.carbon.identity.application.authz.xacml.server.feature.group + ${identity.application.authz.xacml} + org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group @@ -1856,6 +1863,10 @@ org.wso2.carbon.identity.application.authentication.framework.server.feature.group ${carbon.identity.framework.version.iotcore} + + org.wso2.carbon.identity.application.authz.xacml.server.feature.group + ${identity.application.authz.xacml} + org.wso2.carbon.tenant.mgt.common.server.feature.group ${carbon.commons.version} @@ -2058,6 +2069,10 @@ org.wso2.carbon.identity.xacml.server.feature.group ${carbon.identity.framework.version.iotcore} + + org.wso2.carbon.identity.application.authz.xacml.server.feature.group + ${identity.application.authz.xacml} + org.wso2.carbon.identity.thrift.authentication.feature.group ${carbon.identity.framework.version.iotcore} @@ -2696,6 +2711,10 @@ org.wso2.carbon.identity.user.profile.feature.group ${carbon.identity.framework.version.iotcore} + + org.wso2.carbon.identity.application.authz.xacml.server.feature.group + ${identity.application.authz.xacml} + org.wso2.carbon.core.server.feature.group ${carbon.kernel.version} @@ -3371,6 +3390,10 @@ org.wso2.carbon.identity.user.profile.feature.group ${carbon.identity.framework.version.iotcore} + + org.wso2.carbon.identity.application.authz.xacml.server.feature.group + ${identity.application.authz.xacml} + org.wso2.carbon.core.server.feature.group ${carbon.kernel.version} diff --git a/pom.xml b/pom.xml index d69a03ba..6d511b07 100644 --- a/pom.xml +++ b/pom.xml @@ -1496,10 +1496,10 @@ 1.1.1 - 4.5.4 + 4.5.8 - 4.7.2 + 4.7.3 5.2.0 @@ -1513,7 +1513,7 @@ 5.1.3 5.1.6 5.1.2 - 5.3.4 + 5.3.9-SNAPSHOT 5.1.1 5.1.4 5.1.1 @@ -1521,6 +1521,7 @@ 5.1.4 1.0.0 0.1.1 + 1.0.0 1.0.2 @@ -1529,8 +1530,8 @@ 4.6.1 - 4.5.8 - 4.6.0 + 4.6.5-SNAPSHOT + 4.6.5-SNAPSHOT 4.7.0 @@ -1547,7 +1548,7 @@ 3.0.12-SNAPSHOT - 6.1.72 + 6.1.73-SNAPSHOT (6.0.0,7.0.0] @@ -1651,7 +1652,7 @@ 1.0.1 - 1.2.15 + 1.2.18-SNAPSHOT 1.4.4