deenath
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored pom files

Browse Source
revert-dabc3590
harshanL 10 years ago
parent 2b52e3ccd2 d66f1a2d2e
commit 4c42f6c337
9 changed files with 79 additions and 89 deletions
Show Stats Download Patch File Download Diff File

2
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
Unescape View File

@ -52,7 +52,7 @@
<instructions> <instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${project.version}</Bundle-Version> <Bundle-Version>${carbon.mobile.device.mgt.version}</Bundle-Version>
<Bundle-Description>Device Management Mobile Impl Bundle</Bundle-Description> <Bundle-Description>Device Management Mobile Impl Bundle</Bundle-Description>
<!--<Bundle-Activator>org.wso2.carbon.device.mgt.mobile.internal.MobileDeviceManagementBundleActivator</Bundle-Activator>--> <!--<Bundle-Activator>org.wso2.carbon.device.mgt.mobile.internal.MobileDeviceManagementBundleActivator</Bundle-Activator>-->
<Private-Package>org.wso2.carbon.device.mgt.mobile.internal</Private-Package> <Private-Package>org.wso2.carbon.device.mgt.mobile.internal</Private-Package>

31
pom.xml
Unescape View File

@ -351,7 +351,7 @@
<dependency> <dependency>
<groupId>org.wso2.carbon.mdm</groupId> <groupId>org.wso2.carbon.mdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId> <artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
<version>${project.version}</version> <version>${carbon.mobile.device.mgt.version}</version>
</dependency> </dependency>
<!--Osgi dependencies--> <!--Osgi dependencies-->
@ -411,7 +411,7 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.apimgt.core</artifactId> <artifactId>org.wso2.carbon.apimgt.core</artifactId>
<version>${apim.version}</version> <version>${carbon.api.mgt.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -422,7 +422,7 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.apimgt.api</artifactId> <artifactId>org.wso2.carbon.apimgt.api</artifactId>
<version>${apim.version}</version> <version>${carbon.api.mgt.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.googlecode.json-simple.wso2</groupId> <groupId>com.googlecode.json-simple.wso2</groupId>
@ -433,7 +433,7 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.apimgt.impl</artifactId> <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
<version>${apim.version}</version> <version>${carbon.api.mgt.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -614,17 +614,13 @@
<cdm.core.version>1.0.0-SNAPSHOT</cdm.core.version> <cdm.core.version>1.0.0-SNAPSHOT</cdm.core.version>
<cdm.core.version.range>[1.0.0, 2.0.0)</cdm.core.version.range> <cdm.core.version.range>[1.0.0, 2.0.0)</cdm.core.version.range>
<carbon.platform.version>4.3.0-SNAPSHOT</carbon.platform.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<!--Maven build number plugin--> <!--Maven build number plugin-->
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version> <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
<!--<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>-->
<!--Jaggery --> <!--Jaggery -->
<jaggery.version>0.9.0.ALPHA6</jaggery.version> <jaggery.version>0.9.0</jaggery.version>
<jaggery.extensions.version>1.0.0</jaggery.extensions.version> <jaggery.extensions.version>1.0.0</jaggery.extensions.version>
<jaggery.extensions.sso.version>1.2.0</jaggery.extensions.sso.version> <jaggery.extensions.sso.version>1.2.0</jaggery.extensions.sso.version>
<jaggery.extensions.carbon.version>1.1.0</jaggery.extensions.carbon.version> <jaggery.extensions.carbon.version>1.1.0</jaggery.extensions.carbon.version>
@ -646,10 +642,6 @@
<orbit.tomcat.version>7.0.52.wso2v5</orbit.tomcat.version> <orbit.tomcat.version>7.0.52.wso2v5</orbit.tomcat.version>
<orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version> <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
<!--API Manager-->
<apim.version>4.3.0-SNAPSHOT</apim.version>
<!--MDM android Agent--> <!--MDM android Agent-->
<mdm.android.agent.archetype.version>1.0.0-SNAPSHOT</mdm.android.agent.archetype.version> <mdm.android.agent.archetype.version>1.0.0-SNAPSHOT</mdm.android.agent.archetype.version>
@ -662,9 +654,6 @@
<!-- Carbon Commons --> <!-- Carbon Commons -->
<carbon.commons.version>4.3.4</carbon.commons.version> <carbon.commons.version>4.3.4</carbon.commons.version>
<!-- Carbon Utils -->
<carbon.utils.version>4.3.0-SNAPSHOT</carbon.utils.version>
<!-- Carbon Deployment --> <!-- Carbon Deployment -->
<carbon.deployment.version>4.3.1</carbon.deployment.version> <carbon.deployment.version>4.3.1</carbon.deployment.version>
@ -680,9 +669,6 @@
<!-- Governance --> <!-- Governance -->
<carbon.governance.version>4.3.0</carbon.governance.version> <carbon.governance.version>4.3.0</carbon.governance.version>
<!-- Transport Management -->
<carbon.transport.mgt.version>4.3.0-SNAPSHOT</carbon.transport.mgt.version>
<!-- Device Management --> <!-- Device Management -->
<carbon.device.mgt.version>1.0.0-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>1.0.0-SNAPSHOT</carbon.device.mgt.version>
@ -745,7 +731,7 @@
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<configuration> <configuration>
<preparationGoals>clean install</preparationGoals> <preparationGoals>clean install</preparationGoals>
<autoVersionSubmodules>true</autoVersionSubmodules> <autoVersionSubmodules>false</autoVersionSubmodules>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -896,6 +882,11 @@
<url>http://maven.wso2.org/nexus/service/local/staging/deploy/maven2/</url> <url>http://maven.wso2.org/nexus/service/local/staging/deploy/maven2/</url>
</repository> </repository>
<repository>
<id>nexus-service-releases</id>
<name>WSO2 Release Service Repository</name>
<url>http://maven.wso2.org/nexus/service/local/repositories/releases/content/</url>
</repository>
</repositories> </repositories>
</project> </project>

14
product/modules/distribution/pom.xml
Unescape View File

@ -216,18 +216,18 @@
<!--<property name="shindig.version" value="2.5.0-beta5"/>--> <!--<property name="shindig.version" value="2.5.0-beta5"/>-->
<mkdir dir="${tempdir}"/> <mkdir dir="${tempdir}"/>
<mkdir dir="${tempdir}/wso2mdm-${project.version}/repository/components"/> <mkdir dir="${tempdir}/wso2mdm-${carbon.mobile.device.mgt.version}/repository/components"/>
<mkdir dir="${tempdir}/wso2mdm-${project.version}/repository/deployment/server"/> <mkdir dir="${tempdir}/wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/server"/>
<mkdir dir="${tempdir}/wso2mdm-${project.version}/repository/deployment/server/webapps"/> <mkdir dir="${tempdir}/wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/server/webapps"/>
<unzip dest="${tempdir}"> <unzip dest="${tempdir}">
<fileset dir="target"> <fileset dir="target">
<include name="wso2mdm-${project.version}.zip"/> <include name="wso2mdm-${carbon.mobile.device.mgt.version}.zip"/>
</fileset> </fileset>
</unzip> </unzip>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
overwrite="true"> overwrite="true">
<fileset <fileset
dir="${tempdir}/wso2mdm-${project.version}/repository/components"></fileset> dir="${tempdir}/wso2mdm-${carbon.mobile.device.mgt.version}/repository/components"></fileset>
</copy> </copy>
<!--testing --> <!--testing -->
<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar"
@ -251,7 +251,7 @@
og4j.logger.net.sf.ehcache=ERROR og4j.logger.net.sf.ehcache=ERROR
</concat> </concat>
<delete file="target/wso2mdm-${project.version}.zip"/> <delete file="target/wso2mdm-${carbon.mobile.device.mgt.version}.zip"/>
<delete dir="${tempdir}"/> <delete dir="${tempdir}"/>
</tasks> </tasks>
</configuration> </configuration>
@ -295,7 +295,7 @@
<delete dir="target/maven-archiver"/> <delete dir="target/maven-archiver"/>
<delete dir="target/wso2carbon-core-${carbon.kernel.version}"/> <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
<delete dir="target/wso2carbon-core-${carbon.kernel.version}"/> <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
<delete file="target/wso2mdm-${project.version}.jar"/> <delete file="target/wso2mdm-${carbon.mobile.device.mgt.version}.jar"/>
<delete dir="target/sources"/> <delete dir="target/sources"/>
<delete dir="target/site"/> <delete dir="target/site"/>
<delete dir="target/antrun"/> <delete dir="target/antrun"/>

94
product/modules/distribution/src/assembly/bin.xml
Unescape View File

@ -48,7 +48,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
</directory> </directory>
<outputDirectory>wso2mdm-${project.version}/repository/conf/multitenancy <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/multitenancy
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>**/stratos.xml</include> <include>**/stratos.xml</include>
@ -62,7 +62,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
</directory> </directory>
<outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf</outputDirectory>
<includes> <includes>
<include>**/tenant-mgt.xml</include> <include>**/tenant-mgt.xml</include>
</includes> </includes>
@ -70,7 +70,7 @@
<fileSet> <fileSet>
<directory>src/repository/resources/styles/css</directory> <directory>src/repository/resources/styles/css</directory>
<outputDirectory>wso2mdm-${project.version}/resources/allthemes/Default/admin <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/resources/allthemes/Default/admin
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>**/**.css</include> <include>**/**.css</include>
@ -78,7 +78,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/resources/styles/images</directory> <directory>src/repository/resources/styles/images</directory>
<outputDirectory>wso2mdm-${project.version}/resources/allthemes/Default/images <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/resources/allthemes/Default/images
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>**/**.gif</include> <include>**/**.gif</include>
@ -89,20 +89,20 @@
<!-- copy documentation --> <!-- copy documentation -->
<fileSet> <fileSet>
<directory>target/site</directory> <directory>target/site</directory>
<outputDirectory>wso2mdm-${project.version}/docs</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/docs</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
<!-- copy the landing page webapp --> <!-- copy the landing page webapp -->
<!-- <fileSet> <!-- <fileSet>
<directory>src/repository/resources/stratos_root</directory> <directory>src/repository/resources/stratos_root</directory>
<outputDirectory>wso2cdm-${project.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory> <outputDirectory>wso2cdm-${carbon.mobile.device.mgt.version}/repository/deployment/server/webapps/STRATOS_ROOT</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet>--> </fileSet>-->
<!--Removed --> <!--Removed -->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules
</directory> </directory>
<outputDirectory>${pom.artifactId}-${project.version}/modules/</outputDirectory> <outputDirectory>${pom.artifactId}-${carbon.mobile.device.mgt.version}/modules/</outputDirectory>
<includes> <includes>
<include>**/carbon/</include> <include>**/carbon/</include>
<include>**/jaggery-test/</include> <include>**/jaggery-test/</include>
@ -114,7 +114,7 @@
<fileSet> <fileSet>
<directory>src/repository/conf</directory> <directory>src/repository/conf</directory>
<outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf</outputDirectory>
<includes> <includes>
<include>**/api-manager.xml</include> <include>**/api-manager.xml</include>
<include>**/security/</include> <include>**/security/</include>
@ -125,7 +125,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/ ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/
</directory> </directory>
<outputDirectory>wso2mdm-${project.version}/repository/conf/security/</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/security/</outputDirectory>
<includes> <includes>
<include>**/entitlement.properties</include> <include>**/entitlement.properties</include>
<include>**/trusted-idp-config.xml</include> <include>**/trusted-idp-config.xml</include>
@ -135,14 +135,14 @@
<directory> <directory>
src/repository/conf/identity/ src/repository/conf/identity/
</directory> </directory>
<outputDirectory>wso2mdm-${project.version}/repository/conf/identity/</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/identity/</outputDirectory>
<includes> <includes>
<include>**/**</include> <include>**/**</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/conf/datasources</directory> <directory>src/repository/conf/datasources</directory>
<outputDirectory>wso2mdm-${project.version}/repository/conf/datasources <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/datasources
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>**/master-datasources.xml</include> <include>**/master-datasources.xml</include>
@ -151,7 +151,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/resources</directory> <directory>src/repository/resources</directory>
<outputDirectory>wso2mdm-${project.version}/repository/resources</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/resources</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -159,7 +159,7 @@
<!--data-bridge configuration--> <!--data-bridge configuration-->
<fileSet> <fileSet>
<directory>src/repository/conf/data-bridge</directory> <directory>src/repository/conf/data-bridge</directory>
<outputDirectory>wso2mdm-${project.version}/repository/conf/data-bridge <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/data-bridge
</outputDirectory> </outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
@ -167,7 +167,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes
</directory> </directory>
<outputDirectory>wso2mdm-${project.version}/lib/runtimes/</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/lib/runtimes/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -176,7 +176,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
</directory> </directory>
<outputDirectory>wso2mdm-${project.version}/dbscripts/service-provider</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/dbscripts/service-provider</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -187,7 +187,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity
</directory> </directory>
<outputDirectory>wso2mdm-${project.version}/dbscripts/identity</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/dbscripts/identity</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -198,7 +198,7 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt
</directory> </directory>
<outputDirectory>wso2mdm-${project.version}/dbscripts/apimgt</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/dbscripts/apimgt</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -208,21 +208,21 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules
</directory> </directory>
<outputDirectory>wso2mdm-${project.version}/modules/</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/modules/</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/modules/encode</directory> <directory>src/repository/modules/encode</directory>
<outputDirectory>wso2mdm-${project.version}/modules/encode</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/modules/encode</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>src/repository/modules/sso</directory> <directory>src/repository/modules/sso</directory>
<outputDirectory>wso2mdm-${project.version}/modules/sso</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/modules/sso</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -231,7 +231,7 @@
<!-- Copying Device Management related dbscripts --> <!-- Copying Device Management related dbscripts -->
<fileSet> <fileSet>
<directory>../distribution/src/repository/dbscripts/cdm</directory> <directory>../distribution/src/repository/dbscripts/cdm</directory>
<outputDirectory>wso2mdm-${project.version}/dbscripts/cdm</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/dbscripts/cdm</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
@ -240,14 +240,14 @@
<directory> <directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources
</directory> </directory>
<outputDirectory>${project.artifactId}-${project.version}/repository/resources <outputDirectory>${project.artifactId}-${carbon.mobile.device.mgt.version}/repository/resources
</outputDirectory> </outputDirectory>
</fileSet> </fileSet>
<!-- Copying CDM Jaggery app --> <!-- Copying CDM Jaggery app -->
<fileSet> <fileSet>
<directory>src/repository/jaggeryapps</directory> <directory>src/repository/jaggeryapps</directory>
<outputDirectory>wso2mdm-${project.version}/repository/deployment/server/jaggeryapps <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/server/jaggeryapps
</outputDirectory> </outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
</fileSet> </fileSet>
@ -265,7 +265,7 @@
<!-- Copying API Manager Publisher and Store Jaggery apps --> <!-- Copying API Manager Publisher and Store Jaggery apps -->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/publisher/</directory> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/publisher/</directory>
<outputDirectory>wso2mdm-${project.version}/repository/deployment/server/jaggeryapps/publisher</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/server/jaggeryapps/publisher</outputDirectory>
<excludes> <excludes>
<exclude>publisherLogo/**</exclude> <exclude>publisherLogo/**</exclude>
<exclude>publisherTheme/**</exclude> <exclude>publisherTheme/**</exclude>
@ -276,7 +276,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/store/</directory> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/store/</directory>
<outputDirectory>wso2mdm-${project.version}/repository/deployment/server/jaggeryapps/store</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/server/jaggeryapps/store</outputDirectory>
<excludes> <excludes>
<exclude>storeLogo/**</exclude> <exclude>storeLogo/**</exclude>
<exclude>storeSite/**</exclude> <exclude>storeSite/**</exclude>
@ -289,13 +289,13 @@
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<outputDirectory>wso2mdm-${project.version}/lib/endorsed</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/lib/endorsed</outputDirectory>
<includes> <includes>
<include>javax.el:el-api:jar</include> <include>javax.el:el-api:jar</include>
</includes> </includes>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>wso2mdm-${project.version}/repository/deployment/client/modules <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/client/modules
</outputDirectory> </outputDirectory>
<includes> <includes>
<include>org.hibernate.wso2:hibernate:jar</include> <include>org.hibernate.wso2:hibernate:jar</include>
@ -335,7 +335,7 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
</source> </source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory> <outputDirectory>wso2cdm-${carbon.mobile.device.mgt.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -343,57 +343,57 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
</source> </source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/tomcat</outputDirectory> <outputDirectory>wso2cdm-${carbon.mobile.device.mgt.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file>--> </file>-->
<file> <file>
<source>src/repository/conf/tomcat/context.xml</source> <source>src/repository/conf/tomcat/context.xml</source>
<outputDirectory>wso2mdm-${project.version}/repository/conf/tomcat</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/tomcat</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/event-broker.xml <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
</source> </source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/</outputDirectory> <outputDirectory>wso2cdm-${carbon.mobile.device.mgt.version}/repository/conf/</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>wso2mdm-${project.version}</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>README.txt</source> <source>README.txt</source>
<outputDirectory>wso2mdm-${project.version}</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>LICENSE.txt</source> <source>LICENSE.txt</source>
<outputDirectory>wso2mdm-${project.version}</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>release-notes.html</source> <source>release-notes.html</source>
<outputDirectory>wso2mdm-${project.version}</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source> <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
<outputDirectory>wso2mdm-${project.version}/bin/</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/bin/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source> <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
<outputDirectory>wso2mdm-${project.version}/bin/</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/bin/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -403,7 +403,7 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
</source> </source>
<outputDirectory>wso2mdm-${project.version}/repository/conf/etc</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -413,7 +413,7 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
</source> </source>
<outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -423,7 +423,7 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml
</source> </source>
<outputDirectory>wso2mdm-${project.version}/repository/conf/security</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/security</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -434,43 +434,43 @@
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml
</source> </source>
<outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>src/repository/conf/multitenancy/cloud-services-desc.xml</source> <source>src/repository/conf/multitenancy/cloud-services-desc.xml</source>
<outputDirectory>wso2mdm-${project.version}/repository/conf/multitenancy/ <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/multitenancy/
</outputDirectory> </outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>
<!--<file> <!--<file>
<source>src/repository/conf/axis2/axis2.xml</source> <source>src/repository/conf/axis2/axis2.xml</source>
<outputDirectory>wso2cdm-${project.version}/repository/conf/axis2/</outputDirectory> <outputDirectory>wso2cdm-${carbon.mobile.device.mgt.version}/repository/conf/axis2/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file>--> </file>-->
<file> <file>
<source>src/repository/conf/application-authenticators.xml</source> <source>src/repository/conf/application-authenticators.xml</source>
<outputDirectory>wso2mdm-${project.version}/repository/conf/security/</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source> <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
<outputDirectory>wso2mdm-${project.version}/repository/conf/</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>src/repository/conf/identity.xml</source> <source>src/repository/conf/identity.xml</source>
<outputDirectory>wso2mdm-${project.version}/repository/conf</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf</outputDirectory>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file> <file>
<source>src/repository/conf/security/sso-idp-config.xml</source> <source>src/repository/conf/security/sso-idp-config.xml</source>
<outputDirectory>wso2mdm-${project.version}/repository/conf/security</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/security</outputDirectory>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>

2
product/modules/distribution/src/assembly/dist.xml
Unescape View File

@ -26,7 +26,7 @@
<!-- Copying p2 profile and osgi bundles--> <!-- Copying p2 profile and osgi bundles-->
<fileSet> <fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
<outputDirectory>wso2mdm-${project.version}/repository/components</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}/repository/components</outputDirectory>
<excludes> <excludes>
<exclude>**/eclipse.ini</exclude> <exclude>**/eclipse.ini</exclude>
<exclude>**/*.lock</exclude> <exclude>**/*.lock</exclude>

4
product/modules/distribution/src/assembly/docs.xml
Unescape View File

@ -25,11 +25,11 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>target/site</directory> <directory>target/site</directory>
<outputDirectory>wso2cdm-${project.version}-docs</outputDirectory> <outputDirectory>wso2mdm-${carbon.mobile.device.mgt.version}-docs</outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../../modules/documentation/src/site/xdoc/user-core</directory> <directory>../../modules/documentation/src/site/xdoc/user-core</directory>
<outputDirectory>wso2mobileserver-${project.version}-docs/user-core</outputDirectory> <outputDirectory>wso2mobileserver-${carbon.mobile.device.mgt.version}-docs/user-core</outputDirectory>
<fileMode>755</fileMode> <fileMode>755</fileMode>
<includes> <includes>
<include>user-mgt-actdir.xml</include> <include>user-mgt-actdir.xml</include>

18
product/modules/integration/tests-ui-integration/pom.xml
Unescape View File

@ -62,7 +62,7 @@
<property> <property>
<name>carbon.zip</name> <name>carbon.zip</name>
<value> <value>
${basedir}/../../distribution/target/wso2emm-${project.version}.zip ${basedir}/../../distribution/target/wso2mdm-${carbon.mobile.device.mgt.version}.zip
</value> </value>
</property> </property>
<property> <property>
@ -130,9 +130,9 @@
<configuration> <configuration>
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.wso2.emm</groupId> <groupId>org.wso2.carbon.mdm</groupId>
<artifactId>wso2emm</artifactId> <artifactId>wso2mdm</artifactId>
<version>${project.version}</version> <version>${carbon.mobile.device.mgt.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>${basedir}/target/tobeCopied/</outputDirectory> <outputDirectory>${basedir}/target/tobeCopied/</outputDirectory>
@ -192,7 +192,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/resources/security/ ${basedir}/target/tobeCopied/wso2mdm-${carbon.mobile.device.mgt.version}/repository/resources/security/
</directory> </directory>
<includes> <includes>
<include>**/*.jks</include> <include>**/*.jks</include>
@ -213,7 +213,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/conf/axis2/ ${basedir}/target/tobeCopied/wso2mdm-${carbon.mobile.device.mgt.version}/repository/conf/axis2/
</directory> </directory>
<includes> <includes>
<include>**/*.xml</include> <include>**/*.xml</include>
@ -234,7 +234,7 @@
<resources> <resources>
<resource> <resource>
<directory> <directory>
${basedir}/target/tobeCopied/wso2emm-${project.version}/repository/deployment/client/modules ${basedir}/target/tobeCopied/wso2mdm-${carbon.mobile.device.mgt.version}/repository/deployment/client/modules
</directory> </directory>
<includes> <includes>
<include>**/*.mar</include> <include>**/*.mar</include>
@ -250,8 +250,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.wso2.emm</groupId> <groupId>org.wso2.carbon.mdm</groupId>
<artifactId>org.wso2.emm.integration.ui.pages</artifactId> <artifactId>org.wso2.carbon.mdm.integration.ui.pages</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.automation</groupId> <groupId>org.wso2.carbon.automation</groupId>

2
product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/pom.xml
Unescape View File

@ -182,7 +182,7 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<message>Creating site for ${project.version}.</message> <message>Creating site for ${carbon.mobile.device.mgt.version}.</message>
<outputDirectory>website</outputDirectory> <outputDirectory>website</outputDirectory>
</configuration> </configuration>
</plugin> </plugin>

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

@ -366,7 +366,6 @@
<version>${jaggery.extensions.test.version}</version> <version>${jaggery.extensions.test.version}</version>
</feature> </feature>
<!-- End of Jaggery Features --> <!-- End of Jaggery Features -->
<!-- API Management Features --> <!-- API Management Features -->
<feature> <feature>
<id>org.wso2.carbon.apimgt.core.feature.group</id> <id>org.wso2.carbon.apimgt.core.feature.group</id>

Write Preview
Loading…
Cancel
Save