http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6168f42c/packaging/debian/replace.properties ---------------------------------------------------------------------- diff --git a/packaging/debian/replace.properties b/packaging/debian/replace.properties index d891e79..6520f63 100644 --- a/packaging/debian/replace.properties +++ b/packaging/debian/replace.properties @@ -37,12 +37,12 @@ CONFIGUREVARS= DEPSCLASSPATH= DOCDIR= IPALOCATORLOG=/var/log/cloud/management/ipallocator.log -JAVADIR=/usr/share/cloudstack-management/webapps/client/WEB-INF/lib +JAVADIR=/usr/share/java LIBEXECDIR=/usr/libexec LOCKDIR=/var/lock MSCLASSPATH= MSCONF=/etc/cloud/management -MSENVIRON=/usr/share/cloudstack-management +MSENVIRON=/usr/share/cloud/management MSLOG=/var/log/cloud/management/management-server.log MSLOGDIR=/var/log/cloud/management/ MSMNTDIR=/var/lib/cloud/mnt @@ -52,7 +52,7 @@ PLUGINJAVADIR= PREMIUMJAVADIR= PYTHONDIR=/usr/lib/python2.6/site-packages/ SERVERSYSCONFDIR=/etc/cloud/server -SETUPDATADIR=/usr/share/cloudstack-management/setup +SETUPDATADIR=/usr/share/cloud/setup SYSCONFDIR=/etc SYSTEMCLASSPATH= SYSTEMJARS=
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6168f42c/plugins/hypervisors/kvm/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index fa3c350..8fc8f73 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -43,11 +43,6 @@ <artifactId>libvirt</artifactId> <version>0.4.9</version> </dependency> - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna</artifactId> - <version>3.5.1</version> - </dependency> </dependencies> <build> <defaultGoal>install</defaultGoal> @@ -55,23 +50,68 @@ <testSourceDirectory>test</testSourceDirectory> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.5.1</version> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.3</version> + <configuration> + <finalName>kvm-agent</finalName> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>agent-descriptor.xml</descriptor> + </descriptors> + </configuration> <executions> <execution> - <id>copy-dependencies</id> + <id>make-agent</id> <phase>package</phase> <goals> - <goal>copy-dependencies</goal> + <goal>single</goal> </goals> - <configuration> - <outputDirectory>${project.build.directory}/dependencies</outputDirectory> - <includeScope>runtime</includeScope> - </configuration> </execution> </executions> </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-resources</id> + <!-- here the phase you need --> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>dist</outputDirectory> + <resources> + <resource> + <directory>target</directory> + <includes> + <include>kvm-agent.zip</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.5.1</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>target/dependencies</outputDirectory> + <includeScope>runtime</includeScope> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6168f42c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 16d9f8f..a5fe9f5 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,6 @@ <cs.commons-io.version>1.4</cs.commons-io.version> <cs.reflections.version>0.9.8</cs.reflections.version> <cs.java-ipv6.version>0.10</cs.java-ipv6.version> - <cs.replace.properties>build/replace.properties</cs.replace.properties> </properties> <distributionManagement> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6168f42c/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 17d4723..602ed5b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -130,43 +130,6 @@ </excludes> </configuration> </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <id>generate-resource</id> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <copy overwrite="true" - todir="${basedir}/target/conf"> - <fileset dir="${basedir}/conf"> - <include name="*.in" /> - </fileset> - <globmapper from="*.in" to="*" /> - <filterchain> - <filterreader - classname="org.apache.tools.ant.filters.ReplaceTokens"> - <param type="propertiesfile" - value="${cs.replace.properties}" /> - </filterreader> - </filterchain> - </copy> - <copy - todir="${basedir}/target/conf"> - <fileset dir="${basedir}/conf"> - <exclude name="*.in" /> - </fileset> - </copy> - </target> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6168f42c/usage/pom.xml ---------------------------------------------------------------------- diff --git a/usage/pom.xml b/usage/pom.xml index bf442a3..f7d9dd1 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -102,7 +102,7 @@ <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> <param type="propertiesfile" - value="${cs.replace.properties}" /> + value="${basedir}/../build/replace.properties" /> </filterreader> </filterchain> </copy> @@ -118,7 +118,7 @@ <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens"> <param type="propertiesfile" - value="${cs.replace.properties}" /> + value="${basedir}/../build/replace.properties" /> </filterreader> </filterchain> </copy>
