From 71ab64afa68bd03e16bbbfb2a212d87fc8c8d504 Mon Sep 17 00:00:00 2001 From: charitha Date: Thu, 11 Jun 2020 16:21:27 +0530 Subject: [PATCH] Remove conflicting components --- modules/distribution/src/assembly/bin.xml | 58 -------- .../src/core/conf/identity/identity.xml | 2 +- .../api-publisher/site/conf/site.json | 59 --------- .../core/jaggeryapps/api-store/jaggery.conf | 86 ------------ .../jaggeryapps/api-store/site/conf/site.json | 56 -------- .../windows-web-agent/jaggery.conf | 125 ------------------ modules/p2-profile/iot-core-profile/pom.xml | 19 +-- 7 files changed, 2 insertions(+), 403 deletions(-) delete mode 100644 modules/distribution/src/core/jaggeryapps/api-publisher/site/conf/site.json delete mode 100644 modules/distribution/src/core/jaggeryapps/api-store/jaggery.conf delete mode 100644 modules/distribution/src/core/jaggeryapps/api-store/site/conf/site.json delete mode 100644 modules/distribution/src/core/jaggeryapps/windows-web-agent/jaggery.conf diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index ac918fd0..cca652fe 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -382,21 +382,6 @@ - - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/api-publisher - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher - - publisherLogo/** - publisherTheme/** - publisherSite/** - footer/** - localstyles.css - - - @@ -413,24 +398,6 @@ - - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/api-store/ - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-store - - - storeLogo/** - storeSite/** - base-page/** - login/** - styles-layout.css - **/site/conf/site.json - **/jaggery.conf - - - @@ -1101,24 +1068,6 @@ ${pom.artifactId}-${pom.version}/conf/tomcat - - - src/core/jaggeryapps/api-store/site/conf/site.json - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-store/site/conf - - 755 - - - - - src/core/jaggeryapps/api-publisher/site/conf/site.json - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher/site/conf - - 755 - - src/core/conf/synapse.properties @@ -1458,13 +1407,6 @@ true 644 - - src/core/jaggeryapps/api-store/jaggery.conf - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-store/ - - 755 - src/core/jaggeryapps/privacy-policies/jaggery.conf diff --git a/modules/distribution/src/core/conf/identity/identity.xml b/modules/distribution/src/core/conf/identity/identity.xml index 8622318a..adeffa5b 100644 --- a/modules/distribution/src/core/conf/identity/identity.xml +++ b/modules/distribution/src/core/conf/identity/identity.xml @@ -151,7 +151,7 @@ 3600 - 15552000 + -1 300 diff --git a/modules/distribution/src/core/jaggeryapps/api-publisher/site/conf/site.json b/modules/distribution/src/core/jaggeryapps/api-publisher/site/conf/site.json deleted file mode 100644 index 9f82ee1d..00000000 --- a/modules/distribution/src/core/jaggeryapps/api-publisher/site/conf/site.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "theme" : { - "base" : "wso2", - "subtheme" : "modern" - }, - "context" : "/api-publisher", - "enableRestrictByRoles" : "true", - "enableSelectedTenantSubscription" : "true", - "ssoConfiguration" : { - "enabled" : "false", - "issuer" : "API_PUBLISHER", - "identityProviderURL" : "https://localhost:9443/samlsso", - "keyStorePassword" : "", - "identityAlias" : "", - "verifyAssertionValidityPeriod":"true", - "timestampSkewInSeconds":"300", - "audienceRestrictionsEnabled":"true", - "responseSigningEnabled":"true", - "assertionSigningEnabled":"true", - "keyStoreName" :"", - "signRequests" : "true", - "assertionEncryptionEnabled" : "false", - "idpInit" : "false", - "idpInitSSOURL" : "https://localhost:9443/samlsso?spEntityID=API_PUBLISHER", - "loginUserNameAttribute" : "" - //"identityProviderLogoutURL" : "https://localhost:9443/samlsso", - //"externalLogoutPage" : "https://localhost:9443/samlsso?slo=true" - //"acsURL" : "https://localhost:9443/publisher/jagg/jaggery_acs.jag", //use only if Assertion Consumer Service URL needs to be sent along with SAML request - //"nameIdPolicy" : "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", //If not specified, 'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified' will be used - }, - - "oidcConfiguration" : { - "enabled" : "false", - "issuer" : "API_PUBLISHER", - "identityProviderURI" : "http://localhost:8080/openid-connect-server-webapp/", - "authorizationEndpointURI" : "http://localhost:8080/openid-connect-server-webapp/authorize", - "tokenEndpointURI" : "http://localhost:8080/openid-connect-server-webapp/token", - "userInfoURI" : "http://localhost:8080/openid-connect-server-webapp/userinfo", - "jwksURI" : "http://localhost:8080/openid-connect-server-webapp/jwk", - "logoutEndpointURI" : "http://localhost:8080/openid-connect-server-webapp/logout", - "authHttpMethod": "POST", - "clientConfiguration" : { - "clientId" : "client_am_publisher", - "clientSecret" : "secret", - "responseType" : "code", - "authorizationType" : "authorization_code", - "scope" : "phone email address openid profile", - "redirectURI" : "https://localhost:9443/publisher/jagg/jaggery_oidc_acs.jag", - "postLogoutRedirectURI" : "https://localhost:9443/store/" - } - }, - - "reverseProxy" : { - "enabled" : false, // values true , false , "auto" - will look for X-Forwarded-* headers - "host" : "sample.proxydomain.com", // If reverse proxy do not have a domain name use IP - "context":"", - //"regContext":"" // Use only if different path is used for registry - }, -} diff --git a/modules/distribution/src/core/jaggeryapps/api-store/jaggery.conf b/modules/distribution/src/core/jaggeryapps/api-store/jaggery.conf deleted file mode 100644 index 520acab5..00000000 --- a/modules/distribution/src/core/jaggeryapps/api-store/jaggery.conf +++ /dev/null @@ -1,86 +0,0 @@ -{ - "welcomeFiles":["site/pages/list-apis.jag", "index.html"], - - "logLevel" : "info", - - "errorPages": - { - "401":"/site/pages/error-pages/401.html", - "403":"/site/pages/error-pages/403.html", - "404":"/site/pages/error-pages/404.html", - "500":"/site/pages/error-pages/500.html" - } - , - - "securityConstraints":[ - { - "securityConstraint":{ - "webResourceCollection":{ - "name":"site", - "urlPatterns":["/site/conf/site.json"], - "methods":["GET", "POST", "PUT", "DELETE", "PATCH"] - }, - "authRoles":["admin"] - } - } - ], - - "urlMappings":[ - { - "url":"/apis/info", - "path":"/site/pages/item-info.jag" - }, - { - "url":"/apis/widget", - "path":"/site/pages/widget.jag" - }, - { - "url":"/apis/list", - "path":"/site/pages/list-apis.jag" - }, - { - "url":"/forum/api/topic/*", - "path":"/site/blocks/forum/controller/topics.jag" - }, - { - "url":"/forum/api/reply/*", - "path":"/site/blocks/forum/controller/reply.jag" - }, - { - "url":"/forum/*", - "path":"/site/pages/forum.jag" - }, - { - "url":"/api-docs/*", - "path":"/site/blocks/api-doc/ajax/get.jag" - } - ], - - "filters":[ - { - "name":"HttpHeaderSecurityFilter", - "class":"org.apache.catalina.filters.HttpHeaderSecurityFilter", - "params" : [{"name" : "hstsEnabled", "value" : "false"}] - }, - { - "name": "ContentTypeBasedCachePreventionFilter", - "class": "org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter", - "params" : [ - {"name" : "patterns", "value" : "text/html\" ,application/json\" ,text/plain"}, - {"name" : "filterAction", "value" : "enforce"}, - {"name" : "httpHeaders", "value" : "Cache-Control: no-store, no-cache, must-revalidate, private"} - ] - } - ], - - "filterMappings":[ - { - "name":"HttpHeaderSecurityFilter", - "url":"*" - }, - { - "name":"ContentTypeBasedCachePreventionFilter", - "url":"*" - } - ] -} diff --git a/modules/distribution/src/core/jaggeryapps/api-store/site/conf/site.json b/modules/distribution/src/core/jaggeryapps/api-store/site/conf/site.json deleted file mode 100644 index 13f9190b..00000000 --- a/modules/distribution/src/core/jaggeryapps/api-store/site/conf/site.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "theme" : { - "base" : "wso2" - }, - "context" : "/api-store", - "showPublicStoreURL":true, - "showThemesMenu":false, - "tagWiseMode" :"false", - "tagGroupKey" :"-group", - "ssoConfiguration" : { - "enabled" : "true", - "issuer" : "API_STORE", - "identityProviderURL" : "https://localhost:9443/samlsso", - "keyStorePassword" : "", - "identityAlias" : "", - "responseSigningEnabled":"true", - "assertionSigningEnabled":"true", - "keyStoreName" :"", - "passive" : "true", - "signRequests" : "true", - "assertionEncryptionEnabled" : "false" - }, - "oidcConfiguration" : { - "enabled" : "false", - "issuer" : "API_STORE", - "identityProviderURI" : "http://localhost:8080/openid-connect-server-webapp/", - "authorizationEndpointURI" : "http://localhost:8080/openid-connect-server-webapp/authorize", - "tokenEndpointURI" : "http://localhost:8080/openid-connect-server-webapp/token", - "userInfoURI" : "http://localhost:8080/openid-connect-server-webapp/userinfo", - "jwksURI" : "http://localhost:8080/openid-connect-server-webapp/jwk", - "clientConfiguration" : { - "clientId" : "client_am_store", - "clientSecret" : "secret", - "responseType" : "code", - "authorizationType" : "authorization_code", - "scope" : "phone email address openid profile", - "redirectURI" : "https://localhost:9443/api-store/jagg/jaggery_oidc_acs.jag", - "clientAlgorithm" : "RS256" - } - }, - "mutualAuthConfiguration" : { - "enabled" : "false" - }, - "forum" : { - "topicsPerPage" : "5", - "repliesPerPage" : "5", - "resourceIdentifier" : "common" - }, - "reverseProxy" : { - "enabled" : false, - "host" : "sample.proxydomain.com", - "context":"" - }, - "mapExistingAuthApps" : false - -} diff --git a/modules/distribution/src/core/jaggeryapps/windows-web-agent/jaggery.conf b/modules/distribution/src/core/jaggeryapps/windows-web-agent/jaggery.conf deleted file mode 100644 index 00514b3a..00000000 --- a/modules/distribution/src/core/jaggeryapps/windows-web-agent/jaggery.conf +++ /dev/null @@ -1,125 +0,0 @@ -{ - "displayName": "EMM Web Agent", - "logLevel": "error", - "initScripts": ["/app/modules/init.js"], - "urlMappings": [ - { - "url": "/enrollment", - "path": "/lib/pages.jag" - }, - { - "url": "/enrollment/windows/login", - "path": "/app/modules/enrollments/windows/agent-controller.jag" - }, - { - "url": "/enrollment/windows/enroll", - "path": "/app/modules/enrollments/windows/agent-enroll.jag" - }, - { - "url": "/enrollment/ios/download-certificate", - "path": "/app/modules/enrollments/ios/certificate.jag" - }, - { - "url": "/enrollment/ios/download-agent", - "path": "/app/modules/enrollments/ios/agent.jag" - }, - { - "url": "/enrollment/ios/login", - "path": "/app/modules/enrollments/ios/agent-controller.jag" - }, - { - "url": "/enrollment/ios/enroll", - "path": "/app/modules/enrollments/ios/agent-enroll.jag" - }, - { - "url": "/enrollment/ios/check", - "path": "/app/modules/enrollments/ios/agent-check.jag" - }, - { - "url": "/api/invoker/*", - "path": "/api/invoker-api.jag" - }, - { - "url": "/uuf/login", - "path": "/lib/modules/auth/login.jag" - }, - { - "url": "/uuf/logout", - "path": "/lib/modules/auth/logout.jag" - }, - { - "url": "/uuf/sso/acs", - "path": "/lib/modules/auth/acs.jag" - }, - { - "url": "/public/*", - "path": "/lib/static-files.jag" - }, - { - "url": "/unit/*", - "path": "/lib/units.jag" - }, - { - "url": "/*", - "path": "/lib/pages.jag" - } - ], - "securityConstraints": [ - { - "securityConstraint": { - "webResourceCollection": { - "name": "WINDOWS-WEB-AGENT", - "urlPatterns": [ - "/*" - ] - }, - "userDataConstraint": { - "transportGuarantee": "CONFIDENTIAL" - } - } - }, - { - "securityConstraint": { - "webResourceCollection": { - "name": "WINDOWS-WEB-AGENT-http", - "urlPatterns": [ - "/public/*", - "/enrollments/windows/*", - "/enrollment/windows/*" - ] - }, - "userDataConstraint": { - "transportGuarantee": "NONE" - } - } - } - ], - "filters": [ - { - "name": "ContentTypeBasedCachePreventionFilter", - "class": "org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter", - "params" : [ - {"name" : "patterns", "value" : "text/html\" ,application/json\" ,text/plain"}, - {"name" : "filterAction", "value" : "enforce"}, - {"name" : "httpHeaders", "value" : "Cache-Control: no-store, no-cache, must-revalidate, private"} - ] - }, - { - "name":"HttpHeaderSecurityFilter", - "class":"org.apache.catalina.filters.HttpHeaderSecurityFilter", - "params" : [{"name" : "hstsEnabled", "value" : "false"}] - } - - ], - "filterMappings": [ - { - "name":"HttpHeaderSecurityFilter", - "url":"*" - }, - { - "name":"ContentTypeBasedCachePreventionFilter", - "url":"*" - } - - ] -} diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 76617532..a5960e7c 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -445,15 +445,9 @@ org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version} - - org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.publisher.ui.feature:${carbon.device.mgt.version} - org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version} - - org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.store.ui.feature:${carbon.device.mgt.version} - @@ -862,21 +856,10 @@ org.wso2.carbon.device.application.mgt.api.feature.group ${carbon.device.mgt.version} - - - org.wso2.carbon.device.application.mgt.publisher.ui.feature.group - ${carbon.device.mgt.version} - - org.wso2.carbon.device.application.mgt.server.feature.group ${carbon.device.mgt.version} - - - org.wso2.carbon.device.application.mgt.store.ui.feature.group - ${carbon.device.mgt.version} - @@ -1849,6 +1832,7 @@ + org.wso2.carbon.device.application.mgt.api.feature.group ${carbon.device.mgt.version} @@ -2465,7 +2449,6 @@ org.wso2.carbon.device.application.mgt.api.feature.group ${carbon.device.mgt.version} - org.wso2.carbon.device.application.mgt.server.feature.group ${carbon.device.mgt.version}