community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/product-iots

Browse Source
merge-requests/1/head
Hasunie 8 years ago
parent 6d5bb848d7 93a4a9d494
commit f51dae6782
19 changed files with 422 additions and 16 deletions
Show Stats Download Patch File Download Diff File

7
modules/analytics/distribution/src/assembly/bin.xml
Unescape View File

@ -833,5 +833,12 @@
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/repository/jaggeryapps/portal/jaggery.conf</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/
</outputDirectory>
<fileMode>755</fileMode>
</file>
</files>
</assembly>

187
modules/analytics/distribution/src/repository/jaggeryapps/portal/jaggery.conf
Unescape View File

@ -0,0 +1,187 @@
{
"initScripts": [
"js/dashboard-deployer.js"
],
"welcomeFiles": [
"routers/tenant.jag"
],
"errorPages": {
"500": "/controllers/error-pages/error500.html",
"404": "/controllers/error-pages/error404.html",
"401": "/controllers/error-pages/error401.html",
"405": "/controllers/error-pages/error405.html",
"403": "/controllers/error-pages/error403.html",
"400": "/controllers/error-pages/error400.html"
},
"urlMappings": [
{
"url": "/login-controller",
"path": "/routers/tenant.jag"
},
{
"url": "/login",
"path": "/routers/tenant.jag"
},
{
"url": "/logout",
"path": "/routers/tenant.jag"
},
{
"url": "/t/*",
"path": "/routers/tenant.jag"
},
{
"url": "/apis/*",
"path": "/routers/tenant.jag"
},
{
"url": "/dashboards/*",
"path": "/routers/tenant.jag"
},
{
"url": "/gadget/*",
"path": "/routers/tenant.jag"
},
{
"url": "/layout/*",
"path": "/routers/tenant.jag"
},
{
"url": "/assets/*",
"path": "/routers/tenant.jag"
},
{
"url": "/create-dashboard",
"path": "/routers/tenant.jag"
},
{
"url": "/dashboard-settings/*",
"path": "/routers/tenant.jag"
},
{
"url": "/select-layout",
"path": "/routers/tenant.jag"
},
{
"url": "/create-gadget",
"path": "/routers/tenant.jag"
},
{
"url": "/upload-gadget",
"path": "/routers/tenant.jag"
},
{
"url": "/upload-layout",
"path": "/routers/tenant.jag"
},
{
"url": "/geojson/world/*",
"path": "/templates/geojson/world.json"
},
{
"url": "/geojson/europe/*",
"path": "/templates/geojson/europe.json"
},
{
"url": "/geojson/usa/*",
"path": "/templates/geojson/usa.json"
},
{
"url": "/geojson/countryInfo/*",
"path": "/templates/geojson/countryInfo.json"
},
{
"url": "/geojson/usaInfo/*",
"path": "/templates/geojson/usaInfo.json"
},
{
"url": "/acs",
"path": "/controllers/acs.jag"
},
{
"url": "/banners/*",
"path": "/routers/tenant.jag"
},
{
"url": "/gadgets/*",
"path": "/routers/tenant.jag"
},
{
"url": "/configs/designer.json",
"path": "/controllers/error-pages/error404.html"
}
],
"listeners": [
{
"class": "org.owasp.csrfguard.CsrfGuardServletContextListener"
},
{
"class": "org.owasp.csrfguard.CsrfGuardHttpSessionListener"
}
],
"servlets": [
{
"name": "JavaScriptServlet",
"class": "org.owasp.csrfguard.servlet.JavaScriptServlet"
}
],
"servletMappings": [
{
"name": "JavaScriptServlet",
"url": "/csrf.js"
}
],
"contextParams": [
{
"name": "Owasp.CsrfGuard.Config",
"value": "repository/conf/security/Owasp.CsrfGuard.dashboard.properties"
}
],
"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"
},
{
"name": "antiClickJackingOption",
"value": "SAMEORIGIN"
}
]
},
{
"name": "TenantStoresFilter",
"class": "org.wso2.carbon.dashboard.store.filter.TenantStoreFilter"
}
],
"filterMappings": [
{
"name": "HttpHeaderSecurityFilter",
"url": "*"
},
{
"name": "TenantStoresFilter",
"url": "/store/*"
},
{
"name": "TenantStoresFilter",
"url": "/temp/*"
},
{
"name":"ContentTypeBasedCachePreventionFilter",
"url":"*"
}
]
}

14
modules/core/distribution/src/assembly/bin.xml
Unescape View File

@ -1312,6 +1312,13 @@
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/repository/jaggeryapps/android-web-agent/jaggery.conf</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/android-web-agent/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<file>
<source>src/repository/jaggeryapps/api-store/jaggery.conf</source>
<outputDirectory>
@ -1347,6 +1354,13 @@
</outputDirectory>
<fileMode>755</fileMode>
</file>
<file>
<source>src/repository/jaggeryapps/windows-web-agent/jaggery.conf</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/windows-web-agent/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<file>
<source>target/webapp-temp/api-application-registration.war</source>

8
modules/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties
Unescape View File

@ -465,6 +465,14 @@ org.owasp.csrfguard.unprotected.dcrRestApi=%servletContext%/dynamic-client-web/*
org.owasp.csrfguard.unprotected.deviceMgtSSOAcs=%servletContext%/devicemgt/uuf/sso/acs
org.owasp.csrfguard.unprotected.deviceMgtAcs=%servletContext%/uuf/sso/acs
org.owasp.csrfguard.unprotected.deviceMgtApi=%servletContext%/devicemgt/api/invoker/execute/*
org.owasp.csrfguard.unprotected.storeEventPublisher=%servletContext%/store/apis/eventpublish/*
org.owasp.csrfguard.unprotected.publisherAcs=%servletContext%/publisher/acs
org.owasp.csrfguard.unprotected.storeAcs=%servletContext%/store/acs
org.owasp.csrfguard.unprotected.apiStoreAcs=%servletContext%/api-store/acs
org.owasp.csrfguard.unprotected.portalAcs=%servletContext%/portal/acs
org.owasp.csrfguard.unprotected.socialAcs=%servletContext%/social/acs
org.owasp.csrfguard.unprotected.appStoreDevices=%servletContext%/store/apps/devices/*
#carbon
org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*

58
modules/core/distribution/src/repository/jaggeryapps/android-web-agent/jaggery.conf
Unescape View File

@ -0,0 +1,58 @@
{
"displayName": "UUF Template App",
"logLevel": "warn",
"urlMappings": [
{
"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"
}
],
"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":"*"
}
]
}

2
modules/core/distribution/src/repository/jaggeryapps/api-store/jaggery.conf
Unescape View File

@ -66,7 +66,7 @@
"name": "ContentTypeBasedCachePreventionFilter",
"class": "org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter",
"params" : [
{"name" : "patterns", "value" : "text/html"},
{"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"}
]

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

@ -0,0 +1,125 @@
{
"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":"*"
}
]
}

2
modules/core/distribution/src/repository/resources/web-apps/web-xml/api#certificate-mgt#v1.0/web.xml
Unescape View File

@ -87,7 +87,7 @@
<filter-class>org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter</filter-class>
<init-param>
<param-name>patterns</param-name>
<param-value>"text/html*","application/json*","text/plain*"</param-value>
<param-value>text/html" ,application/json" ,text/plain</param-value>
</init-param>
<init-param>
<param-name>filterAction</param-name>

2
modules/core/distribution/src/repository/resources/web-apps/web-xml/api#identity#entitlement/web.xml
Unescape View File

@ -43,7 +43,7 @@
<filter-class>org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter</filter-class>
<init-param>
<param-name>patterns</param-name>
<param-value>"text/html*","application/json*","text/plain*"</param-value>
<param-value>text/html" ,application/json" ,text/plain</param-value>
</init-param>
<init-param>
<param-name>filterAction</param-name>

2
modules/core/distribution/src/repository/resources/web-apps/web-xml/api#scep-mgt#v1.0/web.xml
Unescape View File

@ -67,7 +67,7 @@
<filter-class>org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter</filter-class>
<init-param>
<param-name>patterns</param-name>
<param-value>"text/html*","application/json*","text/plain*"</param-value>
<param-value>text/html" ,application/json" ,text/plain</param-value>
</init-param>
<init-param>
<param-name>filterAction</param-name>

2
modules/core/distribution/src/repository/resources/web-apps/web-xml/api-application-registration/web.xml
Unescape View File

@ -73,7 +73,7 @@
<filter-class>org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter</filter-class>
<init-param>
<param-name>patterns</param-name>
<param-value>"text/html*","application/json*","text/plain*"</param-value>
<param-value>text/html" ,application/json" ,text/plain</param-value>
</init-param>
<init-param>
<param-name>filterAction</param-name>

2
modules/core/distribution/src/repository/resources/web-apps/web-xml/client-registration#v0.11/web.xml
Unescape View File

@ -62,7 +62,7 @@
<filter-class>org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter</filter-class>
<init-param>
<param-name>patterns</param-name>
<param-value>"text/html*","application/json*","text/plain*"</param-value>
<param-value>text/html" ,application/json" ,text/plain</param-value>
</init-param>
<init-param>
<param-name>filterAction</param-name>

2
modules/core/distribution/src/repository/resources/web-apps/web-xml/oauth2/web.xml
Unescape View File

@ -36,7 +36,7 @@
<filter-class>org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter</filter-class>
<init-param>
<param-name>patterns</param-name>
<param-value>"text/html*","application/json*","text/plain*"</param-value>
<param-value>text/html" ,application/json" ,text/plain</param-value>
</init-param>
<init-param>
<param-name>filterAction</param-name>

2
modules/core/distribution/src/repository/resources/web-apps/web-xml/secured-websocket/web.xml
Unescape View File

@ -36,7 +36,7 @@
<filter-class>org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter</filter-class>
<init-param>
<param-name>patterns</param-name>
<param-value>"text/html*","application/json*","text/plain*"</param-value>
<param-value>text/html" ,application/json" ,text/plain</param-value>
</init-param>
<init-param>
<param-name>filterAction</param-name>

2
modules/core/distribution/src/repository/resources/web-apps/web-xml/shindig/web.xml
Unescape View File

@ -88,7 +88,7 @@
<filter-class>org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter</filter-class>
<init-param>
<param-name>patterns</param-name>
<param-value>"text/html*","application/json*","text/plain*"</param-value>
<param-value>text/html" ,application/json" ,text/plain</param-value>
</init-param>
<init-param>
<param-name>filterAction</param-name>

7
modules/core/p2-profile-gen/pom.xml
Unescape View File

@ -699,6 +699,9 @@
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.client.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.jsservice.feature:${carbon.analytics.version}
</featureArtifactDef>
<!-- *************** End of DAS Client *************** -->
<featureArtifactDef>
@ -1497,6 +1500,10 @@
<id>org.wso2.carbon.analytics.api.client.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.jsservice.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<!-- *************** END - DAS Client *************** -->
<!-- ************** START - EVENT PROCESSING FEATURES ************ -->

2
modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/pom.xml
Unescape View File

@ -219,7 +219,7 @@
</adviceFile>
<bundles>
<bundleDef>
org.coffeeking:org.coffeeking.connectedcup.plugin:${wso2.iot.version}
org.coffeeking:org.coffeeking.connectedcup.plugin:${org.coffeeking.version}
</bundleDef>
</bundles>
<importFeatures>

10
modules/distribution/src/resources/samples/samples-deployer.xml
Unescape View File

@ -50,8 +50,8 @@
<goal>p2-repo-gen</goal>
</goals>
<configuration>
<metadataRepository>file:${basedir}/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/p2-repo</artifactRepository>
<metadataRepository>file:\${basedir}/p2-repo</metadataRepository>
<artifactRepository>file:\${basedir}/p2-repo</artifactRepository>
<publishArtifacts>true</publishArtifacts>
<publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts>
@ -69,9 +69,9 @@
</goals>
<configuration>
<profile>default</profile>
<metadataRepository>file:${basedir}/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/p2-repo</artifactRepository>
<destination>${basedir}/../core/repository/components</destination>
<metadataRepository>file:\${basedir}/p2-repo</metadataRepository>
<artifactRepository>file:\${basedir}/p2-repo</artifactRepository>
<destination>\${basedir}/../core/repository/components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles>
<features>
<feature>

2
pom.xml
Unescape View File

@ -1547,7 +1547,7 @@
<!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.1.5</carbon.analytics.common.version>
<carbon.analytics.version>1.3.0</carbon.analytics.version>
<carbon.analytics.version>1.3.3-SNAPSHOT</carbon.analytics.version>
<carbon.analytics.das.version>1.3.0</carbon.analytics.das.version>
<product.iot.analytics.version>${product.iot.version}</product.iot.analytics.version>
<product.das.version>3.1.0</product.das.version>

Write Preview
Loading…
Cancel
Save