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

Merge pull request #283 from milanperera/cloud

Browse Source 
Merging changes of master to cloud branch
merge-requests/1/head
Milan Perera 8 years ago committed by GitHub
parent dc0d0c0c53 9c8942cffc
commit 6e5e149c87
15 changed files with 139 additions and 26 deletions
Show Stats Download Patch File Download Diff File

8
modules/analytics/distribution/src/ues/designer.json
Unescape View File

@ -34,7 +34,7 @@
"methods": { "methods": {
"oauth": { "oauth": {
"attributes": { "attributes": {
"apimgt-gateway": true, "apimgt-gateway": false,
"oauthProvider": { "oauthProvider": {
"appRegistration": { "appRegistration": {
"appType": "webapp", "appType": "webapp",
@ -43,10 +43,12 @@
"password":"admin", "password":"admin",
"dynamicClientAppRegistrationServiceURL": "https://localhost:9443/dynamic-client-web/register", "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/dynamic-client-web/register",
"apiManagerClientAppRegistrationServiceURL": "https://localhost:9443/api-application-registration/register/tenants", "apiManagerClientAppRegistrationServiceURL": "https://localhost:9443/api-application-registration/register/tenants",
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", "grantType": "password refresh_token urn:ietf:urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
"tokenScope": "admin", "tokenScope": "admin",
"callbackUrl": "https://localhost:9445/portal", "callbackUrl": "https://localhost:9445/portal",
"saasApp":true "saasApp":true,
"samlGrantTypeName":"urn:ietf:params:oauth:grant-type:saml2-bearer"
}, },
"tokenServiceURL": "https://localhost:9443/oauth2/token" "tokenServiceURL": "https://localhost:9443/oauth2/token"
}, },

2
modules/core/distribution/identity_config_change.xml
Unescape View File

@ -7,7 +7,7 @@
<!-- Add the scope validator config element --> <!-- Add the scope validator config element -->
<add> <add>
<after>//s:Server/s:OAuth/s:OAuthCallbackHandlers</after> <after>//s:Server/s:OAuth/s:OAuthCallbackHandlers</after>
<value><![CDATA[<OAuthScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.validators.ExtendedJDBCScopeValidator"/>]]></value> <value><![CDATA[<OAuthScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.ScopeValidationHandler"/>]]></value>
</add> </add>
<!-- Add the ntlm grant type validator config element --> <!-- Add the ntlm grant type validator config element -->
<add> <add>

8
modules/core/distribution/pom.xml
Unescape View File

@ -128,7 +128,7 @@
<replacement> <replacement>
<xpath>/Server/OAuth/SupportedGrantTypes/SupportedGrantType</xpath> <xpath>/Server/OAuth/SupportedGrantTypes/SupportedGrantType</xpath>
<token>(org.wso2.carbon.identity.oauth2.token.handlers.grant.saml.SAML2BearerGrantHandler)</token> <token>(org.wso2.carbon.identity.oauth2.token.handlers.grant.saml.SAML2BearerGrantHandler)</token>
<value>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedSAML2BearerGrantHandler</value> <value>org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedSAML2BearerGrantHandler</value>
</replacement> </replacement>
<replacement> <replacement>
<xpath>/Server/OAuth/SupportedGrantTypes/SupportedGrantType</xpath> <xpath>/Server/OAuth/SupportedGrantTypes/SupportedGrantType</xpath>
@ -140,7 +140,11 @@
<token>(org.wso2.carbon.identity.oauth.callback.DefaultCallbackHandler)</token> <token>(org.wso2.carbon.identity.oauth.callback.DefaultCallbackHandler)</token>
<value>org.wso2.carbon.apimgt.keymgt.util.APIManagerOAuthCallbackHandler</value> <value>org.wso2.carbon.apimgt.keymgt.util.APIManagerOAuthCallbackHandler</value>
</replacement> </replacement>
<replacement>
<xpath>/Server/SSOService/UseAuthenticatedUserDomainCrypto</xpath>
<token>(false)</token>
<value>true</value>
</replacement>
</replacements> </replacements>
</configuration> </configuration>
</execution> </execution>

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

@ -115,6 +115,7 @@
<exclude>**/repository/conf/security/Owasp.CsrfGuard.Carbon.properties</exclude> <exclude>**/repository/conf/security/Owasp.CsrfGuard.Carbon.properties</exclude>
<exclude>**/repository/components/plugins/httpclient_4.3.2.wso2v1.jar</exclude> <exclude>**/repository/components/plugins/httpclient_4.3.2.wso2v1.jar</exclude>
<exclude>**/conf/tomcat/carbon/WEB-INF/web.xml</exclude> <exclude>**/conf/tomcat/carbon/WEB-INF/web.xml</exclude>
<exclude>**/repository/components/plugins/org.wso2.carbon.hostobjects.sso_4.5.4.jar</exclude>
</excludes> </excludes>
</fileSet> </fileSet>
@ -953,6 +954,14 @@
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying apim-integration.xml -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/apim-integration.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- Copying api-manager.xml --> <!-- Copying api-manager.xml -->
<file> <file>
<source>src/repository/conf/api-manager.xml</source> <source>src/repository/conf/api-manager.xml</source>

2
modules/core/distribution/src/repository/bin/wso2server.bat
Unescape View File

@ -162,7 +162,7 @@ set CARBON_CLASSPATH=.\lib;%CARBON_CLASSPATH%
set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed" set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dlogger.server.name="IoT-Core" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf" -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\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 -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof" -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dlogger.server.name="IoT-Core" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf" -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\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 -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="8243"
:runJava :runJava
echo JAVA_HOME environment variable is set to %JAVA_HOME% echo JAVA_HOME environment variable is set to %JAVA_HOME%

4
modules/core/distribution/src/repository/bin/wso2server.sh
Unescape View File

@ -318,6 +318,10 @@ do
-Diot.gateway.host="localhost" \ -Diot.gateway.host="localhost" \
-Diot.gateway.https.port="8243" \ -Diot.gateway.https.port="8243" \
-Diot.gateway.http.port="8280" \ -Diot.gateway.http.port="8280" \
-Diot.apimpublisher.host="localhost" \
-Diot.apimpublisher.https.port="9443" \
-Diot.apimstore.host="localhost" \
-Diot.apimstore.https.port="9443" \
org.wso2.carbon.bootstrap.Bootstrap $* org.wso2.carbon.bootstrap.Bootstrap $*
status=$? status=$?
done done

2
modules/core/distribution/src/repository/conf/etc/webapp-publisher-config.xml
Unescape View File

@ -35,6 +35,6 @@
<!--Webapp will be published only when running below profiles--> <!--Webapp will be published only when running below profiles-->
<Profiles> <Profiles>
<Profile>default</Profile> <Profile>default</Profile>
<Profile>devicetype-publisher</Profile> <Profile>device-manager</Profile>
</Profiles> </Profiles>
</WebappPublisherConfigs> </WebappPublisherConfigs>

2
modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml
Unescape View File

@ -44,7 +44,7 @@
</AuthenticationStep> </AuthenticationStep>
</AuthenticationSteps> </AuthenticationSteps>
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername> <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
<UseTenantDomainInUsername>false</UseTenantDomainInUsername> <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
</LocalAndOutBoundAuthenticationConfig> </LocalAndOutBoundAuthenticationConfig>
<RequestPathAuthenticatorConfigs> <RequestPathAuthenticatorConfigs>
</RequestPathAuthenticatorConfigs> </RequestPathAuthenticatorConfigs>

2
modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml
Unescape View File

@ -44,7 +44,7 @@
</AuthenticationStep> </AuthenticationStep>
</AuthenticationSteps> </AuthenticationSteps>
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername> <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
<UseTenantDomainInUsername>false</UseTenantDomainInUsername> <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
</LocalAndOutBoundAuthenticationConfig> </LocalAndOutBoundAuthenticationConfig>
<RequestPathAuthenticatorConfigs> <RequestPathAuthenticatorConfigs>
</RequestPathAuthenticatorConfigs> </RequestPathAuthenticatorConfigs>

2
modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml
Unescape View File

@ -44,7 +44,7 @@
</AuthenticationStep> </AuthenticationStep>
</AuthenticationSteps> </AuthenticationSteps>
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername> <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
<UseTenantDomainInUsername>false</UseTenantDomainInUsername> <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
</LocalAndOutBoundAuthenticationConfig> </LocalAndOutBoundAuthenticationConfig>
<RequestPathAuthenticatorConfigs> <RequestPathAuthenticatorConfigs>
</RequestPathAuthenticatorConfigs> </RequestPathAuthenticatorConfigs>

2
modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml
Unescape View File

@ -44,7 +44,7 @@
</AuthenticationStep> </AuthenticationStep>
</AuthenticationSteps> </AuthenticationSteps>
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername> <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
<UseTenantDomainInUsername>false</UseTenantDomainInUsername> <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
</LocalAndOutBoundAuthenticationConfig> </LocalAndOutBoundAuthenticationConfig>
<RequestPathAuthenticatorConfigs> <RequestPathAuthenticatorConfigs>
</RequestPathAuthenticatorConfigs> </RequestPathAuthenticatorConfigs>

2
modules/core/distribution/src/repository/conf/identity/service-providers/store.xml
Unescape View File

@ -44,7 +44,7 @@
</AuthenticationStep> </AuthenticationStep>
</AuthenticationSteps> </AuthenticationSteps>
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername> <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
<UseTenantDomainInUsername>false</UseTenantDomainInUsername> <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
</LocalAndOutBoundAuthenticationConfig> </LocalAndOutBoundAuthenticationConfig>
<RequestPathAuthenticatorConfigs> <RequestPathAuthenticatorConfigs>
</RequestPathAuthenticatorConfigs> </RequestPathAuthenticatorConfigs>

7
modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
Unescape View File

@ -20,7 +20,7 @@
"acs": "%https.host%/portal/acs", "acs": "%https.host%/portal/acs",
"identityAlias": "wso2carbon", "identityAlias": "wso2carbon",
"defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
"useTenantKey": false, "useTenantKey": true,
"isPassive": false "isPassive": false
} }
}, },
@ -34,7 +34,7 @@
"methods": { "methods": {
"oauth": { "oauth": {
"attributes": { "attributes": {
"apimgt-gateway": false, "apimgt-gateway": true,
"oauthProvider": { "oauthProvider": {
"appRegistration": { "appRegistration": {
"appType": "webapp", "appType": "webapp",
@ -46,7 +46,8 @@
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
"tokenScope": "admin", "tokenScope": "admin",
"callbackUrl": "%https.host%/portal", "callbackUrl": "%https.host%/portal",
"saasApp":true "saasApp":true,
"samlGrantTypeName":"urn:ietf:params:oauth:grant-type:saml2-bearer"
}, },
"tokenServiceURL": "https://localhost:9443/oauth2/token" "tokenServiceURL": "https://localhost:9443/oauth2/token"
}, },

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

@ -146,6 +146,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.integration.client.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.handler.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.handler.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
@ -618,6 +621,12 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.rest.api.dcr.feature:${carbon.api.mgt.version} org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.rest.api.dcr.feature:${carbon.api.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.rest.api.publisher.feature:${carbon.api.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.rest.api.store.feature:${carbon.api.mgt.version}
</featureArtifactDef>
<!-- End of API Management Features --> <!-- End of API Management Features -->
<!-- TCP Transport --> <!-- TCP Transport -->
@ -770,7 +779,7 @@
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>p2-profile-generation-devicetype-publisher-profile</id> <id>p2-profile-generation-device-manager-profile</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>materialize-product</goal> <goal>materialize-product</goal>
@ -782,11 +791,11 @@
<targetPath> <targetPath>
file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
</targetPath> </targetPath>
<profile>devicetype-publisher</profile> <profile>device-manager</profile>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>p2-profile-generation-devicetype-worker-profile</id> <id>p2-profile-generation-device-backend-profile</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>materialize-product</goal> <goal>materialize-product</goal>
@ -798,7 +807,7 @@
<targetPath> <targetPath>
file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
</targetPath> </targetPath>
<profile>devicetype-worker</profile> <profile>device-backend</profile>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -893,6 +902,10 @@
<id>org.wso2.carbon.apimgt.application.extension.feature.group</id> <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.email.sender.feature.group</id> <id>org.wso2.carbon.email.sender.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -1053,6 +1066,14 @@
<id>org.wso2.carbon.apimgt.rest.api.dcr.feature.group</id> <id>org.wso2.carbon.apimgt.rest.api.dcr.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.rest.api.publisher.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.rest.api.store.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<!-- API Manager Publisher and Store Features --> <!-- API Manager Publisher and Store Features -->
<feature> <feature>
<id>org.wso2.carbon.apimgt.gateway.feature.group</id> <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
@ -1911,6 +1932,10 @@
<id>org.wso2.carbon.apimgt.application.extension.feature.group</id> <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -2327,6 +2352,10 @@
<id>org.wso2.carbon.apimgt.application.extension.feature.group</id> <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id> <id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -2390,6 +2419,10 @@
<id>org.wso2.carbon.apimgt.application.extension.feature.group</id> <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.certificate.mgt.api.feature.group</id> <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -2433,7 +2466,7 @@
<goal>p2-profile-gen</goal> <goal>p2-profile-gen</goal>
</goals> </goals>
<configuration> <configuration>
<profile>devicetype-publisher</profile> <profile>device-manager</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository> <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository> <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination> <destination>
@ -2512,6 +2545,10 @@
<id>org.wso2.carbon.apimgt.application.extension.feature.group</id> <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.email.sender.feature.group</id> <id>org.wso2.carbon.email.sender.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -2863,6 +2900,18 @@
<id>org.wso2.carbon.apimgt.gateway.feature.group</id> <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.rest.api.dcr.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.rest.api.publisher.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.rest.api.store.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.apimgt.core.feature.group</id> <id>org.wso2.carbon.apimgt.core.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
@ -3021,6 +3070,10 @@
<id>org.wso2.carbon.apimgt.application.extension.feature.group</id> <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.certificate.mgt.api.feature.group</id> <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -3091,7 +3144,7 @@
<goal>p2-profile-gen</goal> <goal>p2-profile-gen</goal>
</goals> </goals>
<configuration> <configuration>
<profile>devicetype-worker</profile> <profile>device-backend</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository> <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository> <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination> <destination>
@ -3150,6 +3203,10 @@
<id>org.wso2.carbon.apimgt.application.extension.feature.group</id> <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.email.sender.feature.group</id> <id>org.wso2.carbon.email.sender.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -3215,6 +3272,7 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.adapter.feature.group</id> <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
@ -3481,6 +3539,18 @@
<id>org.wso2.carbon.apimgt.store.feature.group</id> <id>org.wso2.carbon.apimgt.store.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.rest.api.dcr.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.rest.api.publisher.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.apimgt.rest.api.store.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.registry.extensions.feature.group</id> <id>org.wso2.carbon.registry.extensions.feature.group</id>
<version>${carbon.governance.version}</version> <version>${carbon.governance.version}</version>
@ -3631,6 +3701,10 @@
<id>org.wso2.carbon.apimgt.application.extension.feature.group</id> <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -3686,6 +3760,25 @@
<version>${identity.inbound.auth.saml.version.iotcore}</version> <version>${identity.inbound.auth.saml.version.iotcore}</version>
</feature> </feature>
<!-- SSO Fix--> <!-- SSO Fix-->
<!-- Dashboard Features -->
<feature>
<id>org.wso2.carbon.dashboards.shindig.feature.group</id>
<version>${carbon.dashboard.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.dashboards.portal.feature.group</id>
<version>${carbon.dashboard.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.dashboard.deployment.feature.group</id>
<version>${carbon.dashboard.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.iot.device.statistics.dashboard.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of Dashboard Features -->
</features> </features>
</configuration> </configuration>
</execution> </execution>

8
pom.xml
Unescape View File

@ -1534,21 +1534,21 @@
<carbon.governance.version>4.7.0</carbon.governance.version> <carbon.governance.version>4.7.0</carbon.governance.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.device.mgt.version>2.0.13</carbon.device.mgt.version> <carbon.device.mgt.version>2.0.14-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>3.1.0-SNAPSHOT</product.iot.version> <product.iot.version>3.1.0-SNAPSHOT</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>3.0.10</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>3.0.11-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.1.35</carbon.api.mgt.version> <carbon.api.mgt.version>6.1.64</carbon.api.mgt.version>
<carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range> <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
<!-- Carbon Mediation --> <!-- Carbon Mediation -->
<carbon.mediation.version>4.6.9</carbon.mediation.version> <carbon.mediation.version>4.6.10</carbon.mediation.version>
<!-- Carbon Analytics Common (DAS) --> <!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.1.5</carbon.analytics.common.version> <carbon.analytics.common.version>5.1.5</carbon.analytics.common.version>

Write Preview
Loading…
Cancel
Save