kavishka
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
application-manager-new
charitha 8 years ago
parent e75c79cd66 daababf256
commit f571c26e57
7 changed files with 277 additions and 203 deletions
Show Stats Download Patch File Download Diff File

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

@ -168,7 +168,7 @@
<classpath refid="maven.compile.classpath" /> <classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" /> <classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/src/repository/resources/dbscripts/apimgt/h2.sql" /> <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt/h2.sql"/>
</sql> </sql>
<echo message="##################### END ####################" /> <echo message="##################### END ####################" />
</tasks> </tasks>
@ -196,7 +196,7 @@
<classpath refid="maven.compile.classpath" /> <classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" /> <classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/src/repository/resources/dbscripts/appmgt/h2.sql" /> <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/appmgt/h2.sql"/>
</sql> </sql>
<echo message="##################### END ####################" /> <echo message="##################### END ####################" />
</tasks> </tasks>
@ -346,6 +346,20 @@ d <exclude name="**/shindig.properties" /
<goal>run</goal> <goal>run</goal>
</goals> </goals>
</execution> </execution>
<execution>
<id>modify_entitlement_properties</id>
<phase>prepare-package</phase>
<configuration>
<tasks>
<replace token= "PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" value="#PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/">
<include name="entitlement.properties"/>
</replace>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions> </executions>
</plugin> </plugin>

2
modules/core/distribution/src/api-resources/api_templates/velocity_template.xml
Unescape View File

@ -338,7 +338,7 @@
#end #end
</inSequence> </inSequence>
<outSequence> <outSequence>
<class name="org.wso2.carbon.apimgt.usage.publisher.APIMgtResponseHandler"/> <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
## check and set response caching ## check and set response caching
#if($responseCacheEnabled) #if($responseCacheEnabled)
<cache scope="per-host" collector="true"/> <cache scope="per-host" collector="true"/>

2
modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_throttle_out_handler_.xml
Unescape View File

@ -1,5 +1,5 @@
<sequence name="_throttle_out_handler_" xmlns="http://ws.apache.org/ns/synapse"> <sequence name="_throttle_out_handler_" xmlns="http://ws.apache.org/ns/synapse">
<property name="X-JWT-Assertion" scope="transport" action="remove"/> <property name="X-JWT-Assertion" scope="transport" action="remove"/>
<class name="org.wso2.carbon.apimgt.usage.publisher.APIMgtThrottleUsageHandler"/> <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtThrottleUsageHandler"/>
<sequence key="_cors_request_handler_"/> <sequence key="_cors_request_handler_"/>
</sequence> </sequence>

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

@ -298,9 +298,7 @@
<!-- Copying API management related dbscripts --> <!-- Copying API management related dbscripts -->
<fileSet> <fileSet>
<directory> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt</directory>
src/repository/resources/dbscripts/apimgt
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/apimgt</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/apimgt</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
@ -846,6 +844,12 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/oidc-scope-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file> <file>
<source>src/repository/conf/identity/identity.xml</source> <source>src/repository/conf/identity/identity.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity

25
modules/core/distribution/src/repository/conf/entitlement.properties
Unescape View File

@ -1,3 +1,21 @@
#
# Copyright (c) 2013, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
#
# WSO2 Inc. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
# in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
PDP.Enable=true PDP.Enable=true
PAP.Enable=true PAP.Enable=true
PDP.DecisionCaching.Enable=true PDP.DecisionCaching.Enable=true
@ -12,7 +30,13 @@ PDP.Balana.Config.Enable=false
PDP.Multiple.Decision.Profile.Enable=true PDP.Multiple.Decision.Profile.Enable=true
PDP.Global.Policy.Combining.Algorithm=urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:deny-overrides PDP.Global.Policy.Combining.Algorithm=urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:deny-overrides
PAP.Policy.Add.Start.Enable=false PAP.Policy.Add.Start.Enable=false
#PAP.Policy.Add.Start.Policy.File.Path=
PAP.Items.Per.Page=10 PAP.Items.Per.Page=10
PDP.Registry.Level.Policy.Cache.Clear=false
PDP.PolicyCaching.CachingInterval=100
Entitlement.Engine.CachingInterval=100000
PDP.References.MaxPolicyEntries=3000
#PDP.Extensions.Extension.1=your.extension.class.name #PDP.Extensions.Extension.1=your.extension.class.name
@ -20,6 +44,7 @@ PAP.Items.Per.Page=10
#PDP.Policy.Store=org.wso2.carbon.identity.entitlement.policy.store.CarbonRegistryPolicyStore #PDP.Policy.Store=org.wso2.carbon.identity.entitlement.policy.store.CarbonRegistryPolicyStore
PIP.AttributeDesignators.Designator.1=org.wso2.carbon.identity.entitlement.pip.DefaultAttributeFinder PIP.AttributeDesignators.Designator.1=org.wso2.carbon.identity.entitlement.pip.DefaultAttributeFinder
#PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP
PIP.ResourceFinders.Finder.1=org.wso2.carbon.identity.entitlement.pip.DefaultResourceFinder PIP.ResourceFinders.Finder.1=org.wso2.carbon.identity.entitlement.pip.DefaultResourceFinder
PAP.Entitlement.Data.Finder.1=org.wso2.carbon.identity.entitlement.pap.CarbonEntitlementDataFinder PAP.Entitlement.Data.Finder.1=org.wso2.carbon.identity.entitlement.pap.CarbonEntitlementDataFinder

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

File diff suppressed because it is too large Load Diff

34
pom.xml
Unescape View File

@ -825,19 +825,19 @@
<version>${joda-time.version}</version> <version>${joda-time.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.identity</groupId> <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId> <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
<version>${carbon.identity.version}</version> <version>${identity.inbound.auth.oauth.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.identity</groupId> <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>org.wso2.carbon.identity.oauth.dto</artifactId> <artifactId>org.wso2.carbon.identity.oauth.dto</artifactId>
<version>${carbon.identity.version}</version> <version>${identity.inbound.auth.oauth.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.identity</groupId> <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>org.wso2.carbon.identity.oauth</artifactId> <artifactId>org.wso2.carbon.identity.oauth</artifactId>
<version>${carbon.identity.version}</version> <version>${identity.inbound.auth.oauth.version}</version>
</dependency> </dependency>
<!-- Tomcat dependencies --> <!-- Tomcat dependencies -->
<dependency> <dependency>
@ -1496,18 +1496,23 @@
<!-- Carbon Identity --> <!-- Carbon Identity -->
<carbon.identity.framework.version>5.2.0</carbon.identity.framework.version> <carbon.identity.framework.version>5.2.0</carbon.identity.framework.version>
<carbon.identity.framework.version.iotcore>5.6.89</carbon.identity.framework.version.iotcore>
<carbon.identity.framework.version.range>[5.2.0, 6.0.0)</carbon.identity.framework.version.range> <carbon.identity.framework.version.range>[5.2.0, 6.0.0)</carbon.identity.framework.version.range>
<identity.local.auth.basicauth.version>5.1.1</identity.local.auth.basicauth.version> <identity.local.auth.basicauth.version>5.1.1</identity.local.auth.basicauth.version>
<identity.local.auth.basicauth.version.iotcore>5.2.4</identity.local.auth.basicauth.version.iotcore>
<identity.inbound.auth.openid.version>5.1.1</identity.inbound.auth.openid.version> <identity.inbound.auth.openid.version>5.1.1</identity.inbound.auth.openid.version>
<identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version> <identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version>
<identity.inbound.auth.saml.version.iotcore>5.2.14</identity.inbound.auth.saml.version.iotcore>
<identity.carbon.auth.saml2.version>5.1.3</identity.carbon.auth.saml2.version> <identity.carbon.auth.saml2.version>5.1.3</identity.carbon.auth.saml2.version>
<identity.carbon.auth.saml2.version.iotcore>5.1.6</identity.carbon.auth.saml2.version.iotcore>
<identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version> <identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version>
<identity.inbound.auth.oauth.version.iotcore>5.2.33</identity.inbound.auth.oauth.version.iotcore>
<identity.carbon.auth.mutual.ssl.version>5.1.1</identity.carbon.auth.mutual.ssl.version> <identity.carbon.auth.mutual.ssl.version>5.1.1</identity.carbon.auth.mutual.ssl.version>
<identity.user.ws.version>5.1.2</identity.user.ws.version> <identity.user.ws.version>5.1.3</identity.user.ws.version>
<identity.outbound.auth.requestpath.basicauth.version>5.1.1 <identity.outbound.auth.requestpath.basicauth.version>5.1.1</identity.outbound.auth.requestpath.basicauth.version>
</identity.outbound.auth.requestpath.basicauth.version>
<identity.outbound.auth.requestpath.oauth.version>5.1.1</identity.outbound.auth.requestpath.oauth.version> <identity.outbound.auth.requestpath.oauth.version>5.1.1</identity.outbound.auth.requestpath.oauth.version>
<identity.outbound.auth.samlsso.version>5.1.2</identity.outbound.auth.samlsso.version> <identity.outbound.auth.samlsso.version>5.1.4</identity.outbound.auth.samlsso.version>
<identity.metadata.saml2>0.1.3</identity.metadata.saml2>
<!--JWT grant type extension feature--> <!--JWT grant type extension feature-->
<identity.jwt.extension.version>1.0.2</identity.jwt.extension.version> <identity.jwt.extension.version>1.0.2</identity.jwt.extension.version>
@ -1517,8 +1522,9 @@
<!-- Carbon Registry --> <!-- Carbon Registry -->
<carbon.registry.version>4.5.8</carbon.registry.version> <carbon.registry.version>4.5.8</carbon.registry.version>
<carbon.registry.version.iotcore>4.6.0</carbon.registry.version.iotcore>
<!-- Carbon Governance --> <!-- Carbon Governance -->
<carbon.governance.version>4.6.5</carbon.governance.version> <carbon.governance.version>4.7.0</carbon.governance.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.device.mgt.version>2.0.4-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>2.0.4-SNAPSHOT</carbon.device.mgt.version>
@ -1531,11 +1537,11 @@
<carbon.device.mgt.plugin.version>3.0.4-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>3.0.4-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.0.5</carbon.api.mgt.version> <carbon.api.mgt.version>6.1.2</carbon.api.mgt.version>
<carbon.api.mgt.version.range>(5.0.0,7.0.0]</carbon.api.mgt.version.range> <carbon.api.mgt.version.range>(5.0.0,7.0.0]</carbon.api.mgt.version.range>
<!-- Carbon Mediation --> <!-- Carbon Mediation -->
<carbon.mediation.version>4.6.6</carbon.mediation.version> <carbon.mediation.version>4.6.9</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>
@ -1635,7 +1641,7 @@
<caramel.version>1.0.1</caramel.version> <caramel.version>1.0.1</caramel.version>
<!-- App manager version--> <!-- App manager version-->
<appmgt.feature.version>1.2.8</appmgt.feature.version> <appmgt.feature.version>1.2.9</appmgt.feature.version>
<!-- Carbon Store version--> <!-- Carbon Store version-->
<carbon.store.version>1.4.4</carbon.store.version> <carbon.store.version>1.4.4</carbon.store.version>

Write Preview
Loading…
Cancel
Save