community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove conflicting components

Browse Source
This commit is contained in:
charitha 2020-06-11 16:21:27 +05:30
parent 019c9bea35
commit 71ab64afa6
7 changed files with 2 additions and 403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
modules/distribution/src/assembly/bin.xml
View File

@ -382,21 +382,6 @@
</excludes>
</fileSet>
<!-- Copying API Manager Publisher and Store Jaggery apps -->
<fileSet>
<directory>
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/api-publisher
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher</outputDirectory>
<excludes>
<exclude>publisherLogo/**</exclude>
<exclude>publisherTheme/**</exclude>
<exclude>publisherSite/**</exclude>
<exclude>footer/**</exclude>
<exclude>localstyles.css</exclude>
<!-- <exclude>**/jaggery.conf</exclude>-->
</excludes>
</fileSet>
<!--<fileSet>-->
<!--<directory>-->
<!--../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/store/-->
@ -413,24 +398,6 @@
<!--</excludes>-->
<!--</fileSet>-->
<!-- Copying API Manager Store Jaggery app -->
<fileSet>
<directory>
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/api-store/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-store
</outputDirectory>
<excludes>
<exclude>storeLogo/**</exclude>
<exclude>storeSite/**</exclude>
<exclude>base-page/**</exclude>
<exclude>login/**</exclude>
<exclude>styles-layout.css</exclude>
<exclude>**/site/conf/site.json</exclude>
<exclude>**/jaggery.conf</exclude>
</excludes>
</fileSet>
<!-- <fileSet>-->
<!-- <directory>-->
<!-- ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/social/-->
@ -1101,24 +1068,6 @@
<outputDirectory>${pom.artifactId}-${pom.version}/conf/tomcat</outputDirectory>
</file>
<!-- Copying config file for enabling sso in api-store-->
<file>
<source>src/core/jaggeryapps/api-store/site/conf/site.json</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-store/site/conf
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!-- Copying config file for enabling sso in api-publisher-->
<file>
<source>src/core/jaggeryapps/api-publisher/site/conf/site.json</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher/site/conf
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!-- Copying synapse.properties file -->
<file>
<source>src/core/conf/synapse.properties</source>
@ -1458,13 +1407,6 @@
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/core/jaggeryapps/api-store/jaggery.conf</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-store/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<file>
<source>src/core/jaggeryapps/privacy-policies/jaggery.conf</source>

2
modules/distribution/src/core/conf/identity/identity.xml
View File

@ -151,7 +151,7 @@
<!-- Default validity period for user access tokens in seconds -->
<UserAccessTokenDefaultValidityPeriod>3600</UserAccessTokenDefaultValidityPeriod>
<!-- Validity period for refresh token -->
<RefreshTokenValidityPeriod>15552000</RefreshTokenValidityPeriod>
<RefreshTokenValidityPeriod>-1</RefreshTokenValidityPeriod>
<!-- Timestamp skew in seconds -->
<TimestampSkew>300</TimestampSkew>
<!-- Enable OAuth caching -->

59
modules/distribution/src/core/jaggeryapps/api-publisher/site/conf/site.json
View File

@ -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
},
}

86
modules/distribution/src/core/jaggeryapps/api-store/jaggery.conf
View File

@ -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":"*"
}
]
}

56
modules/distribution/src/core/jaggeryapps/api-store/site/conf/site.json
View File

@ -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
}

125
modules/distribution/src/core/jaggeryapps/windows-web-agent/jaggery.conf
View File

@ -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":"*"
}
]
}

19
modules/p2-profile/iot-core-profile/pom.xml
View File

@ -445,15 +445,9 @@
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.publisher.ui.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.store.ui.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- End of New App Manager Features-->
<!-- Dashboards Features -->
@ -862,21 +856,10 @@
<id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.application.mgt.publisher.ui.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.application.mgt.store.ui.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!-- End of App Manager Features-->
<!-- Device Management Features -->
@ -1849,6 +1832,7 @@
</feature>
<!-- End of IoTServer Features -->
<!-- App Manager Features-->
<feature>
<id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
<version>${carbon.device.mgt.version}</version>
@ -2465,7 +2449,6 @@
<id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>