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

Migrated to CDMF with Generic UI

Browse Source
application-manager-new
charithag 9 years ago
parent 66e4d99b57
commit 247dfa9820
5 changed files with 289 additions and 506 deletions
Show Stats Download Patch File Download Diff File

81
modules/distribution/pom.xml
Unescape View File

@ -1,6 +1,6 @@
<?org.wso2.uesxml version="1.0" encoding="UTF-8"?> <?org.wso2.uesxml version="1.0" encoding="UTF-8"?>
<!-- <!--
~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~ ~
~ WSO2 Inc. licenses this file to you under the Apache License, ~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except ~ Version 2.0 (the "License"); you may not use this file except
@ -17,8 +17,8 @@
~ under the License. ~ under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
@ -104,31 +104,6 @@
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>
<!--============ Added with ES Features ===============-->
<execution>
<id>social-h2-table-gen</id>
<phase>package</phase>
<configuration>
<target>
<echo message="########### Create Social Database ##############"/>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social"
overwrite="false">
<fileset
dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/">
</fileset>
</copy>
<path id="h2.classpath">
<path refid="maven.compile.classpath"/>
</path>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<!--============ End with ES Features ===============-->
<execution> <execution>
<!-- Creating Device Management schema --> <!-- Creating Device Management schema -->
<id>create-device-mgt-schema</id> <id>create-device-mgt-schema</id>
@ -315,56 +290,6 @@
</goals> </goals>
</execution> </execution>
<!--Install default samples-->
<execution>
<id>install_samples</id>
<phase>package</phase>
<configuration>
<tasks>
<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/conf/iot"/>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot"
overwrite="true">
<fileset
file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xml"/>
</copy>
<subant target="deploy">
<fileset
dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino"
includes="build.xml"/>
</subant>
<subant target="deploy">
<fileset
dir="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi"
includes="build.xml"/>
</subant>
<!--subant target="deploy">
<fileset
dir="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm"
includes="build.xml"/>
</subant-->
<copy todir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/"
overwrite="true">
<fileset
file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/iot-config.xml"/>
</copy>
<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml"
toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml.disable"/>
<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml"
toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml.disable"/>
<!--<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm/build.xml"-->
<!--toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/virtual_firealarm/build.xml.disable"/>-->
<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/sample_pom.xml"
toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/pom.xml"
overwrite="true"/>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<!--Install default samples-->
<execution> <execution>
<id>install_libs</id> <id>install_libs</id>
<phase>package</phase> <phase>package</phase>

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

@ -349,106 +349,126 @@
<exclude>**/publisher/config/publisher-tenant.json</exclude> <exclude>**/publisher/config/publisher-tenant.json</exclude>
<exclude>**/sso/jaggery.conf</exclude> <exclude>**/sso/jaggery.conf</exclude>
<exclude>**/sso/views/register_new_user.jag</exclude> <exclude>**/sso/views/register_new_user.jag</exclude>
<exclude>**/devicemgt/*</exclude>
</excludes> </excludes>
</fileSet> </fileSet>
<!--============ Added with ES Features ===============-->
<!-- copy the landing page webapp --> <!-- Copying mdm app from devicemgt app-->
<fileSet> <fileSet>
<directory>lib/home</directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt/
</directory>
<outputDirectory> <outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/STRATOS_ROOT ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/iotserver
</outputDirectory> </outputDirectory>
</fileSet> </fileSet>
<!--============ Added with ES Features ===============-->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/client</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<!--============ Added with ES Features ===============-->
<!--copy jaxrs web app for OAuth feature-->
<fileSet> <fileSet>
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaxwebapps ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/
</directory> </directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaxwebapps <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/
</outputDirectory> </outputDirectory>
<includes> <filtered>false</filtered>
<include>oauth2endpoints.war</include> <fileMode>644</fileMode>
</includes>
</fileSet> </fileSet>
<!--============ Added with ES Features ===============-->
<!-- copy the landing page webapp -->
<fileSet> <fileSet>
<directory>target/jaxwebapps</directory> <directory>lib/home</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaxwebapps <outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/STRATOS_ROOT
</outputDirectory> </outputDirectory>
<includes>
<include>**/**</include>
</includes>
</fileSet> </fileSet>
<!--============ Added with ES Features ===============--> <!--============ Added with ES Features ===============-->
<fileSet> <!--<fileSet>-->
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin</directory> <!--<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/client</directory>-->
<outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>-->
<includes> <!--<includes>-->
<include>**/ciphertool.sh</include> <!--<include>*/**</include>-->
<include>**/ciphertool.bat</include> <!--</includes>-->
</includes> <!--</fileSet>-->
</fileSet>
<!--============ Added with ES Features ===============--> <!--============ Added with ES Features ===============-->
<fileSet> <!--copy jaxrs web app for OAuth feature-->
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib</directory> <!--<fileSet>-->
<outputDirectory>${pom.artifactId}-${pom.version}/lib/</outputDirectory> <!--<directory>-->
<includes> <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaxwebapps-->
<include>**/org.wso2.ciphertool-1.0.0-wso2v3.jar</include> <!--</directory>-->
</includes> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaxwebapps-->
</fileSet> <!--</outputDirectory>-->
<!--<includes>-->
<!--<include>oauth2endpoints.war</include>-->
<!--</includes>-->
<!--</fileSet>-->
<!--============ Added with ES Features ===============-->
<!--<fileSet>-->
<!--<directory>target/jaxwebapps</directory>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaxwebapps-->
<!--</outputDirectory>-->
<!--<includes>-->
<!--<include>**/**</include>-->
<!--</includes>-->
<!--</fileSet>-->
<!--============ Added with ES Features ===============-->
<!--<fileSet>-->
<!--<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin</directory>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>-->
<!--<includes>-->
<!--<include>**/ciphertool.sh</include>-->
<!--<include>**/ciphertool.bat</include>-->
<!--</includes>-->
<!--</fileSet>-->
<!--============ Added with ES Features ===============--> <!--============ Added with ES Features ===============-->
<fileSet> <!--<fileSet>-->
<directory>src/repository/conf/etc</directory> <!--<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib</directory>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/lib/</outputDirectory>-->
<includes> <!--<includes>-->
<include>**/**</include> <!--<include>**/org.wso2.ciphertool-1.0.0-wso2v3.jar</include>-->
</includes> <!--</includes>-->
</fileSet> <!--</fileSet>-->
<!--============ Added with ES Features ===============-->
<!--<fileSet>-->
<!--<directory>src/repository/conf/etc</directory>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory>-->
<!--<includes>-->
<!--<include>**/**</include>-->
<!--</includes>-->
<!--</fileSet>-->
<!--============ Added with ES Features ===============--> <!--============ Added with ES Features ===============-->
<fileSet> <!--<fileSet>-->
<directory> <!--<directory>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/ <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/-->
</directory> <!--</directory>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/ <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security/-->
</outputDirectory> <!--</outputDirectory>-->
<includes> <!--<includes>-->
<include>**/sso_redirect.html</include> <!--<include>**/sso_redirect.html</include>-->
</includes> <!--</includes>-->
</fileSet> <!--</fileSet>-->
<!--============ Added with ES Features ===============--> <!--============ Added with ES Features ===============-->
<fileSet> <!--<fileSet>-->
<directory> <!--<directory>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps-->
</directory> <!--</directory>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps-->
</outputDirectory> <!--</outputDirectory>-->
<includes> <!--<includes>-->
<include>shindig.war</include> <!--<include>shindig.war</include>-->
</includes> <!--</includes>-->
</fileSet> <!--</fileSet>-->
<!--============ Added with ES Features ===============--> <!--============ Added with ES Features ===============-->
@ -476,29 +496,6 @@
<!--========================================================================================================--> <!--========================================================================================================-->
<!-- End of Enterprise Store Features --> <!-- End of Enterprise Store Features -->
<!--copy web app for devices-->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
<includes>
<include>common.war</include>
</includes>
</fileSet>
<!-- Copying Authentication Endpoint webapp -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
<includes>
<include>authenticationendpoint.war</include>
<include>oauth2.war</include>
</includes>
</fileSet>
<!--============ Added with API Features ===============--> <!--============ Added with API Features ===============-->
<fileSet> <fileSet>
<directory>src/api-resource/customsequences</directory> <directory>src/api-resource/customsequences</directory>
@ -690,31 +687,31 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xsd <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/device-type-config.xsd-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>-->
<filtered>true</filtered> <!--<filtered>true</filtered>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xml <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xml-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>-->
<filtered>true</filtered> <!--<filtered>true</filtered>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xsd <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xsd-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>-->
<filtered>true</filtered> <!--<filtered>true</filtered>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<file> <file>
<source>INSTALL.txt</source> <source>INSTALL.txt</source>
<outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
@ -818,14 +815,14 @@
</file> </file>
<!--app management config file--> <!--app management config file-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/app-management-config.xml <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/app-management-config.xml-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>-->
<filtered>true</filtered> <!--<filtered>true</filtered>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!--License Config file--> <!--License Config file-->
<file> <file>
@ -951,52 +948,52 @@
<!--========================================================================================================--> <!--========================================================================================================-->
<!-- Enterprise Store Features --> <!-- Enterprise Store Features -->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/email/email-admin-config.xml <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/email/email-admin-config.xml-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/email</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/email</outputDirectory>-->
<filtered>true</filtered> <!--<filtered>true</filtered>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
<filtered>true</filtered> <!--<filtered>true</filtered>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<file> <!--<file>-->
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml <!--<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>-->
<filtered>true</filtered> <!--<filtered>true</filtered>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!--============ Added with ES Features ===============--> <!--============ Added with ES Features ===============-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/social-datasources.xml <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/social-datasources.xml-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources/</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources/</outputDirectory>-->
<filtered>true</filtered> <!--<filtered>true</filtered>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!--============ Added with ES Features ===============--> <!--============ Added with ES Features ===============-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/shindig.properties</source> <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/shindig.properties</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
<filtered>true</filtered> <!--<filtered>true</filtered>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!--========================================================================================================--> <!--========================================================================================================-->
<!-- End of Enterprise Store Features --> <!-- End of Enterprise Store Features -->

7
modules/integration/pom.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~ ~
~ WSO2 Inc. licenses this file to you under the Apache License, ~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except ~ Version 2.0 (the "License"); you may not use this file except
@ -17,7 +17,8 @@
~ under the License. ~ under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
@ -37,7 +38,7 @@
<module>tests-integration</module> <module>tests-integration</module>
<!--<module>tests-ui-integration</module>--> <!--<module>tests-ui-integration</module>-->
<module>tests-platform</module> <module>tests-platform</module>
<module>tests-samples</module> <!--<module>tests-samples</module>-->
</modules> </modules>
<!--<build>--> <!--<build>-->

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

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~ ~
~ WSO2 Inc. licenses this file to you under the Apache License, ~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except ~ Version 2.0 (the "License"); you may not use this file except
@ -16,8 +17,8 @@
~ specific language governing permissions and limitations ~ specific language governing permissions and limitations
~ under the License. ~ under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
@ -110,44 +111,43 @@
org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version} org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version}
</featureArtifactDef> </featureArtifactDef>
<!--Device Cloud Features -->
<featureArtifactDef>
org.wso2.carbon.device.mgt.iot:org.wso2.carbon.device.mgt.iot.feature:${carbon.iot.device.mgt.version}
</featureArtifactDef>
<!--=====================================================================================================-->
<!-- Device Management Features --> <!-- Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.group.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.group.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.dynamic.client.registration.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.enterprise.store.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.devicemgt.ui.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version}-->
<!--</featureArtifactDef>-->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.common.api.feature:${carbon.device.mgt.version}-->
<!--</featureArtifactDef>-->
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<!-- Jaggery Features --> <!-- Jaggery Features -->
@ -440,61 +440,8 @@
<!--+++++++++++++++++++++++++++++++++++++++++++++++--> <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
<!-- End of Carbon Deployment Features --> <!-- End of Carbon Deployment Features -->
<!-- Registry Features -->
<!-- Store Features -->
<featureArtifactDef>
org.wso2.carbon.store:org.wso2.carbon.store.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:event.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:login.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:permission.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:registration.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:bampublisher.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:store.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:ues.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:account-management.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:rxt.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:utils.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:lifecycle.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.social.version}
</featureArtifactDef>
<feaureArtifactDef>
org.wso2.carbon.store:org.wso2.carbon.store.extensions.assets.gadget.feature:${carbon.store.version}
</feaureArtifactDef>
<feaureArtifactDef>
org.wso2.carbon.store:org.wso2.carbon.store.extensions.assets.site.feature:${carbon.store.version}
</feaureArtifactDef>
<!--+++++++++++++++++++++++++++++++++++++++++++++++--> <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
<!-- End of Store Features -->
<!--&lt;!&ndash; Registry Features &ndash;&gt;-->
<!--&lt;!&ndash;+++++++++++++++++++++++++++++++++++++++++++++++&ndash;&gt;-->
<!--<featureArtifactDef>--> <!--<featureArtifactDef>-->
<!--org.wso2.carbon.registry:org.wso2.carbon.registry.task.feature:${carbon.registry.version}--> <!--org.wso2.carbon.registry:org.wso2.carbon.registry.task.feature:${carbon.registry.version}-->
<!--</featureArtifactDef>--> <!--</featureArtifactDef>-->
@ -520,8 +467,6 @@
org.wso2.ciphertool:org.wso2.ciphertool.feature:${ciphertool.version} org.wso2.ciphertool:org.wso2.ciphertool.feature:${ciphertool.version}
</feaureArtifactDef> </feaureArtifactDef>
<!-- End of Enterprise Store Features -->
<!--=====================================================================================================--> <!--=====================================================================================================-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version} org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
@ -614,8 +559,6 @@
org.wso2.carbon.data:org.wso2.carbon.datasource.reader.hadoop.server.feature:${carbon.data.version} org.wso2.carbon.data:org.wso2.carbon.datasource.reader.hadoop.server.feature:${carbon.data.version}
</featureArtifactDef> </featureArtifactDef>
<!-- ************** START - Capp Management ********* --> <!-- ************** START - Capp Management ********* -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
@ -732,12 +675,6 @@
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
</feature> </feature>
<!-- IoT Features -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.feature.group</id>
<version>${carbon.iot.device.mgt.version}</version>
</feature>
<!--========================================================================================================--> <!--========================================================================================================-->
<!-- Device Management Features --> <!-- Device Management Features -->
<feature> <feature>
@ -769,13 +706,28 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.server.feature.group</id> <id>
org.wso2.carbon.dynamic.client.registration.server.feature.group
</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group
</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.enterprise.store.feature.group</id> <id>org.wso2.carbon.devicemgt.ui.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.device.mgt.common.api.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.device.mgt.analytics.server.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>-->
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<!-- Jaggery Features --> <!-- Jaggery Features -->
@ -1163,74 +1115,6 @@
</feature> </feature>
<!-- End of Carbon Deployment Features --> <!-- End of Carbon Deployment Features -->
<!-- Store Features -->
<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
<feature>
<id>org.wso2.carbon.store.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.store.modules.event.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.store.modules.login.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.store.modules.permission.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.store.modules.registration.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.store.modules.bampublisher.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.store.modules.store.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.store.modules.ues.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.store.modules.account-management.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.store.modules.rxt.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.store.modules.utils.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.store.modules.lifecycle.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.social.feature.group</id>
<version>${carbon.social.version}</version>
</feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.store.extensions.assets.gadget.feature.group</id>-->
<!--<version>${carbon.store.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.store.extensions.assets.site.feature.group</id>-->
<!--<version>${carbon.store.version}</version>-->
<!--</feature>-->
<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
<!-- End of Store Features -->
<!-- Commons Features --> <!-- Commons Features -->
<!--+++++++++++++++++++++++++++++++++++++++++++++++--> <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
<feature> <feature>

42
pom.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~ ~
~ WSO2 Inc. licenses this file to you under the Apache License, ~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except ~ Version 2.0 (the "License"); you may not use this file except
@ -17,7 +17,8 @@
~ under the License. ~ under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -412,27 +413,6 @@
<artifactId>org.wso2.carbon.device.mgt.analytics</artifactId> <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<!--IOT dependencies-->
<dependency>
<groupId>org.wso2.carbon.iot</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
<version>${carbon.iot.device.mgt.version}</version>
</dependency>
<!--Osgi dependencies--> <!--Osgi dependencies-->
<dependency> <dependency>
@ -834,7 +814,7 @@
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version> <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
<!--Jaggery --> <!--Jaggery -->
<jaggery.version>0.12.0-M1</jaggery.version> <jaggery.version>0.12.0</jaggery.version>
<jaggery.extensions.version>1.5.0-M1</jaggery.extensions.version> <jaggery.extensions.version>1.5.0-M1</jaggery.extensions.version>
<jaggery.extensions.sso.version>1.5.0-M1</jaggery.extensions.sso.version> <jaggery.extensions.sso.version>1.5.0-M1</jaggery.extensions.sso.version>
<jaggery.extensions.carbon.version>1.5.0-M1</jaggery.extensions.carbon.version> <jaggery.extensions.carbon.version>1.5.0-M1</jaggery.extensions.carbon.version>
@ -845,17 +825,13 @@
<handlebars.feature.version>1.5.0-M1</handlebars.feature.version> <handlebars.feature.version>1.5.0-M1</handlebars.feature.version>
<markdown.feature.version>1.5.0-M1</markdown.feature.version> <markdown.feature.version>1.5.0-M1</markdown.feature.version>
<!-- Store Features -->
<carbon.store.version>2.3.9-SNAPSHOT</carbon.store.version>
<carbon.social.version>2.3.9-SNAPSHOT</carbon.social.version>
<!-- Additional Stuff from ES Features --> <!-- Additional Stuff from ES Features -->
<carbon.dashboard.version>1.0.5</carbon.dashboard.version> <carbon.dashboard.version>1.0.5</carbon.dashboard.version>
<ciphertool.version>1.0.0-wso2v3</ciphertool.version> <ciphertool.version>1.0.0-wso2v3</ciphertool.version>
<el.api.version>2.2</el.api.version> <el.api.version>2.2</el.api.version>
<!--Testing --> <!--Testing -->
<test.framework.version>4.4.1</test.framework.version> <test.framework.version>4.4.2</test.framework.version>
<testng.version>6.8.5</testng.version> <testng.version>6.8.5</testng.version>
<automation.utils.version>4.4.1</automation.utils.version> <automation.utils.version>4.4.1</automation.utils.version>
<test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version> <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
@ -879,10 +855,10 @@
<carbon.deployment.version>4.6.0</carbon.deployment.version> <carbon.deployment.version>4.6.0</carbon.deployment.version>
<!-- Carbon Identity --> <!-- Carbon Identity -->
<carbon.identity.version>4.6.0-SNAPSHOT</carbon.identity.version> <carbon.identity.version>5.0.2</carbon.identity.version>
<!-- Carbon Multi-tenancy --> <!-- Carbon Multi-tenancy -->
<carbon.multitenancy.version>4.5.0-m1</carbon.multitenancy.version> <carbon.multitenancy.version>4.5.0</carbon.multitenancy.version>
<!-- Carbon Registry --> <!-- Carbon Registry -->
<carbon.registry.version>4.4.8</carbon.registry.version> <carbon.registry.version>4.4.8</carbon.registry.version>
@ -899,10 +875,10 @@
<carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version> <carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
<!-- carbon mediation --> <!-- carbon mediation -->
<carbon.mediation.version>4.4.11-SNAPSHOT</carbon.mediation.version> <carbon.mediation.version>4.4.11</carbon.mediation.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version> <carbon.api.mgt.version>4.3.0</carbon.api.mgt.version>
<!-- Tomcat --> <!-- Tomcat -->
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version> <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>

Write Preview
Loading…
Cancel
Save