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

Merge pull request #171 from ayyoob/das-ext

Browse Source 
few changes added after testing with the cluster
merge-requests/1/head
Ruwan 9 years ago committed by GitHub
parent 74e5583e34 2df0515585
commit 44a0a61a85
6 changed files with 82 additions and 56 deletions
Show Stats Download Patch File Download Diff File

4
modules/distribution/src/api-resources/synapse-configs/default/api/_Dynamic_Client_Registration_API_.xml
Unescape View File

@ -1,5 +1,5 @@
<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2DCRAPI_" context="/dcr"> <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2DCRAPI_" context="/dynamic-client-web/register">
<resource methods="POST DELETE" url-mapping="/register" faultSequence="_dcr_fault_"> <resource methods="POST DELETE" url-mapping="/*" faultSequence="_dcr_fault_">
<inSequence> <inSequence>
<property name="uri.var.portnum" expression="get-property('keyManager.port')"/> <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
<property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/> <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>

15
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -500,8 +500,8 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/api-resources/synapse-configs/default/sequences</directory> <directory>src/api-resources/synapse-configs</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs/default/sequences</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs/</outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>
@ -512,17 +512,6 @@
</includes> </includes>
</fileSet> </fileSet>
<!-- Copying synapse-config directory -->
<fileSet>
<directory>src/repository/resources</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server
</outputDirectory>
<excludes>
<exclude>**/empty.txt</exclude>
<exclude>**/styles/**</exclude>
</excludes>
</fileSet>
<!-- Copying RXTs corresponding API management related components --> <!-- Copying RXTs corresponding API management related components -->
<fileSet> <fileSet>
<directory> <directory>

BIN
modules/distribution/src/repository/resources/security/wso2certs.jks
View File

Binary file not shown.

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

@ -150,6 +150,7 @@
<version>1.1</version> <version>1.1</version>
<executions> <executions>
<execution> <execution>
<id>default-feature-install</id>
<phase>package</phase> <phase>package</phase>
<configuration> <configuration>
<tasks> <tasks>
@ -163,6 +164,21 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
</execution> </execution>
<execution>
<id>devicetype-feature-install</id>
<phase>package</phase>
<configuration>
<tasks>
<replace token="false" value="true"
dir="repository/components/devicetype-publisher/configuration/org.eclipse.equinox.simpleconfigurator">
<include name="**/bundles.info"/>
</replace>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>

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

@ -453,9 +453,6 @@
</featureArtifactDef> </featureArtifactDef>
<!-- Carbon Commons Features --> <!-- Carbon Commons Features -->
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.databridge.datapublisher.feature:${carbon.commons.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.ndatasource.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.ndatasource.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
@ -568,13 +565,10 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.deployment:org.wso2.carbon.bam.service.agent.feature:${carbon.deployment.version}
</featureArtifactDef>
<!--End of APIM Feature--> <!--End of APIM Feature-->
<!--DAS Feature--> <!--DAS Feature-->
<!--START - Analytics Features --> <!--START - Analytics Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.version} org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.version}
@ -674,10 +668,18 @@
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.execution.manager.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.event.execution.manager.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.output.adapter.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.server.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<!--End of DAS Feature--> <!--End of DAS Feature-->
<!-- Dashboards Features --> <!-- Dashboards Features -->
@ -1796,11 +1798,6 @@
<id>org.wso2.carbon.module.mgt.server.feature.group</id> <id>org.wso2.carbon.module.mgt.server.feature.group</id>
<version>${carbon.deployment.version}</version> <version>${carbon.deployment.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
<version>${carbon.commons.version}</version>
</feature>
<feature> <feature>
<id>org.apache.synapse.wso2.feature.group</id> <id>org.apache.synapse.wso2.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
@ -2217,10 +2214,6 @@
<id>org.wso2.carbon.module.mgt.server.feature.group</id> <id>org.wso2.carbon.module.mgt.server.feature.group</id>
<version>${carbon.deployment.version}</version> <version>${carbon.deployment.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
<version>${carbon.commons.version}</version>
</feature>
<feature> <feature>
<id>org.apache.synapse.wso2.feature.group</id> <id>org.apache.synapse.wso2.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
@ -2432,10 +2425,6 @@
<id>org.wso2.carbon.idp.mgt.feature.group</id> <id>org.wso2.carbon.idp.mgt.feature.group</id>
<version>${carbon.identity.version}</version> <version>${carbon.identity.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.bam.service.agent.feature.group</id>
<version>${carbon.deployment.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.ndatasource.feature.group</id> <id>org.wso2.carbon.ndatasource.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -2720,11 +2709,6 @@
<id>org.wso2.carbon.module.mgt.server.feature.group</id> <id>org.wso2.carbon.module.mgt.server.feature.group</id>
<version>${carbon.deployment.version}</version> <version>${carbon.deployment.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
<version>${carbon.commons.version}</version>
</feature>
<feature> <feature>
<id>org.apache.synapse.wso2.feature.group</id> <id>org.apache.synapse.wso2.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
@ -2733,7 +2717,6 @@
<id>org.apache.synapse.transport.nhttp.feature.group</id> <id>org.apache.synapse.transport.nhttp.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.task.server.feature.group</id> <id>org.wso2.carbon.task.server.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
@ -2742,7 +2725,6 @@
<id>org.wso2.carbon.mediation.initializer.feature.group</id> <id>org.wso2.carbon.mediation.initializer.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.mediation.admin.feature.group</id> <id>org.wso2.carbon.mediation.admin.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
@ -3012,10 +2994,6 @@
<id>org.wso2.carbon.apimgt.hostobjects.oidc.feature.group</id> <id>org.wso2.carbon.apimgt.hostobjects.oidc.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.bam.service.agent.feature.group</id>
<version>${carbon.deployment.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.metrics.feature.group</id> <id>org.wso2.carbon.metrics.feature.group</id>
<version>${carbon.metrics.version}</version> <version>${carbon.metrics.version}</version>
@ -3090,6 +3068,18 @@
<id>org.wso2.carbon.spark.commons.feature.group</id> <id>org.wso2.carbon.spark.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.event.output.adapter.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>
@ -3271,10 +3261,6 @@
<id>org.wso2.carbon.module.mgt.server.feature.group</id> <id>org.wso2.carbon.module.mgt.server.feature.group</id>
<version>${carbon.deployment.version}</version> <version>${carbon.deployment.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
<version>${carbon.commons.version}</version>
</feature>
<feature> <feature>
<id>org.apache.synapse.wso2.feature.group</id> <id>org.apache.synapse.wso2.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
@ -3556,10 +3542,6 @@
<id>org.wso2.carbon.apimgt.hostobjects.oidc.feature.group</id> <id>org.wso2.carbon.apimgt.hostobjects.oidc.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.bam.service.agent.feature.group</id>
<version>${carbon.deployment.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.metrics.feature.group</id> <id>org.wso2.carbon.metrics.feature.group</id>
<version>${carbon.metrics.version}</version> <version>${carbon.metrics.version}</version>
@ -3634,6 +3616,18 @@
<id>org.wso2.carbon.spark.commons.feature.group</id> <id>org.wso2.carbon.spark.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.event.output.adapter.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>

29
modules/samples/installer/device-deployer.xml
Unescape View File

@ -89,7 +89,30 @@
<destination>repository/components</destination> <destination>repository/components</destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles> <deleteOldProfileFiles>true</deleteOldProfileFiles>
<features> <features>
<!-- STEP#3. ADD YOUR DEVICE TYPE FEATURE GROUP HERE "<ARTIFACT_ID>.group" --> <feature>
<id>org.coffeeking.connectedcup.feature.group</id>
<version>1.0.0-SNAPSHOT</version>
</feature>
<feature>
<id>org.wso2.connectedlap.feature.group</id>
<version>1.0.0-SNAPSHOT</version>
</feature>
</features>
</configuration>
</execution>
<execution>
<id>devicetype-feature-install</id>
<phase>package</phase>
<goals>
<goal>p2-profile-gen</goal>
</goals>
<configuration>
<profile>devicetype-publisher</profile>
<metadataRepository>file:${basedir}/samples/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/samples/p2-repo</artifactRepository>
<destination>repository/components</destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
<feature> <feature>
<id>org.coffeeking.connectedcup.feature.group</id> <id>org.coffeeking.connectedcup.feature.group</id>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
@ -116,6 +139,10 @@
dir="repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator"> dir="repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
<include name="**/bundles.info"/> <include name="**/bundles.info"/>
</replace> </replace>
<replace token="false" value="true"
dir="repository/components/devicetype-publisher/configuration/org.eclipse.equinox.simpleconfigurator">
<include name="**/bundles.info"/>
</replace>
</tasks> </tasks>
</configuration> </configuration>
<goals> <goals>

Write Preview
Loading…
Cancel
Save