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

Fixing pom formating and build xml

Browse Source
revert-70aa11f8
Geeth Munasinghe 10 years ago
parent cde8456f8d
commit d74259c446
3 changed files with 65 additions and 28 deletions
Show Stats Download Patch File Download Diff File

37
modules/distribution/pom.xml
Unescape View File

@ -17,12 +17,6 @@
<description>WSO2 Connected Device Manager (CDM) Distribution</description> <description>WSO2 Connected Device Manager (CDM) Distribution</description>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-server</artifactId>
<version>2.5.0-beta5</version>
<type>war</type>
</dependency>
<dependency> <dependency>
<groupId>javax.el</groupId> <groupId>javax.el</groupId>
<artifactId>el-api</artifactId> <artifactId>el-api</artifactId>
@ -76,19 +70,9 @@
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>target</outputDirectory> <outputDirectory>target</outputDirectory>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>org.apache.shindig</groupId>
<artifactId>shindig-server</artifactId>
<version>2.5.0-beta5</version>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>target/shindig</outputDirectory>
</artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -107,7 +91,7 @@
<tasks> <tasks>
<property name="tempdir" value="target/docs-temp"/> <property name="tempdir" value="target/docs-temp"/>
<property name="jardir" value="target/jars"/> <property name="jardir" value="target/jars"/>
<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}/wso2emm-${project.version}/repository/components"/> <mkdir dir="${tempdir}/wso2emm-${project.version}/repository/components"/>
@ -122,7 +106,7 @@
dir="${tempdir}/wso2emm-${project.version}/repository/components"></fileset> dir="${tempdir}/wso2emm-${project.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"
dest="${jardir}/shindig-common-${shindig.version}"> dest="${jardir}/shindig-common-${shindig.version}">
<patternset> <patternset>
<exclude name="**/shindig.properties"/> <exclude name="**/shindig.properties"/>
@ -137,7 +121,7 @@
<fileset dir="target/shindig/WEB-INF/lib" includes="slf4j*"/> <fileset dir="target/shindig/WEB-INF/lib" includes="slf4j*"/>
</delete> </delete>
<copy file="src/repository/resources/shindig/index.jsp" <copy file="src/repository/resources/shindig/index.jsp"
todir="target/shindig"/> todir="target/shindig"/>-->
<concat destfile="target/wso2carbon-core-${carbon.kernal.version}/repository/log4j.properties"> <concat destfile="target/wso2carbon-core-${carbon.kernal.version}/repository/log4j.properties">
og4j.logger.net.sf.ehcache=ERROR og4j.logger.net.sf.ehcache=ERROR
@ -153,7 +137,7 @@
<phase>package</phase> <phase>package</phase>
<configuration> <configuration>
<tasks> <tasks>
<copy todir="target/wso2carbon-core-${carbon.kernal.version}/modules" <!--<copy todir="target/wso2carbon-core-${carbon.kernal.version}/modules"
overwrite="true"> overwrite="true">
<fileset dir="src/repository/modules"></fileset> <fileset dir="src/repository/modules"></fileset>
</copy> </copy>
@ -165,7 +149,7 @@
<copy todir="target/wso2carbon-core-${carbon.kernal.version}/repository/components/plugins" <copy todir="target/wso2carbon-core-${carbon.kernal.version}/repository/components/plugins"
overwrite="true"> overwrite="true">
<fileset dir="src/repository/components/patches/apimgt"></fileset> <fileset dir="src/repository/components/patches/apimgt"></fileset>
</copy> </copy>-->
</tasks> </tasks>
</configuration> </configuration>
@ -189,7 +173,7 @@
<delete dir="target/site"/> <delete dir="target/site"/>
<delete dir="target/antrun"/> <delete dir="target/antrun"/>
<delete dir="src/site"/> <delete dir="src/site"/>
<delete dir="target/shindig"/> <!--<delete dir="target/shindig"/>-->
<delete dir="target/jaxwebapps"/> <delete dir="target/jaxwebapps"/>
</tasks> </tasks>
</configuration> </configuration>
@ -203,6 +187,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.5.2</version>
<executions> <executions>
<execution> <execution>
<id>1-pre-dist</id> <id>1-pre-dist</id>
@ -212,6 +197,7 @@
<goal>attached</goal> <goal>attached</goal>
</goals> </goals>
<configuration> <configuration>
<appendAssemblyId>false</appendAssemblyId>
<filters> <filters>
<filter>${basedir}/src/assembly/filter.properties</filter> <filter>${basedir}/src/assembly/filter.properties</filter>
</filters> </filters>
@ -221,7 +207,7 @@
</configuration> </configuration>
</execution> </execution>
<execution> <!-- <execution>
<id>2-dist</id> <id>2-dist</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
@ -233,12 +219,9 @@
</filters> </filters>
<descriptors> <descriptors>
<descriptor>${basedir}/src/assembly/bin.xml</descriptor> <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
<!--
<descriptor>${basedir}/src/assembly/docs.xml</descriptor>
-->
</descriptors> </descriptors>
</configuration> </configuration>
</execution> </execution>-->
</executions> </executions>
</plugin> </plugin>

1
modules/distribution/src/assembly/dist.xml
Unescape View File

@ -16,6 +16,7 @@
~ under the License. ~ under the License.
--> -->
<assembly> <assembly>
<id>1-pre-dist</id>
<formats> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>

55
pom.xml
Unescape View File

@ -22,14 +22,67 @@
<module>modules/features</module> <module>modules/features</module>
<module>modules/p2-profile-gen</module> <module>modules/p2-profile-gen</module>
<module>modules/distribution</module> <module>modules/distribution</module>
<!--<module>modules/integration</module>--> <module>modules/integration</module>
</modules> </modules>
<properties> <properties>
<carbon.kernal.version>4.2.0</carbon.kernal.version> <carbon.kernal.version>4.2.0</carbon.kernal.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version> <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
<!--Testing -->
<test.framework.version>4.3.1</test.framework.version>
<testng.version>6.8</testng.version>
<stub.version>4.3.0-SNAPSHOT</stub.version>
<test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
</properties> </properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.wso2.emm</groupId>
<artifactId>org.wso2.emm.integration.ui.pages</artifactId>
<version>${test.automation.emm.ui.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.automation</groupId>
<artifactId>org.wso2.carbon.automation.engine</artifactId>
<version>${test.framework.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.automation</groupId>
<artifactId>org.wso2.carbon.automation.test.utils</artifactId>
<version>${test.framework.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.integration.common.extensions</artifactId>
<version>${stub.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.automation</groupId>
<artifactId>org.wso2.carbon.automation.extensions</artifactId>
<version>${test.framework.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.integration.common.admin.client</artifactId>
<version>${stub.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project> </project>

Write Preview
Loading…
Cancel
Save