cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject [34/50] [abbrv] CLOUDSTACK-1415: Debian & Ubuntu packaging work
Date Thu, 14 Mar 2013 22:35:17 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/293478ae/packaging/debian/replace.properties
----------------------------------------------------------------------
diff --git a/packaging/debian/replace.properties b/packaging/debian/replace.properties
index 6520f63..d891e79 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/java
+JAVADIR=/usr/share/cloudstack-management/webapps/client/WEB-INF/lib
 LIBEXECDIR=/usr/libexec
 LOCKDIR=/var/lock
 MSCLASSPATH=
 MSCONF=/etc/cloud/management
-MSENVIRON=/usr/share/cloud/management
+MSENVIRON=/usr/share/cloudstack-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/cloud/setup
+SETUPDATADIR=/usr/share/cloudstack-management/setup
 SYSCONFDIR=/etc
 SYSTEMCLASSPATH=
 SYSTEMJARS=

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/293478ae/plugins/hypervisors/kvm/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index 5792440..4c3bc0c 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -43,6 +43,11 @@
       <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>
@@ -50,68 +55,23 @@
       <testSourceDirectory>test</testSourceDirectory>
        <plugins>
         <plugin>
-          <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>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.5.1</version>
           <executions>
             <execution>
-              <id>make-agent</id>
+              <id>copy-dependencies</id>
               <phase>package</phase>
               <goals>
-                <goal>single</goal>
+                <goal>copy-dependencies</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/293478ae/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0ee62cd..b26ee49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,7 @@
     <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/293478ae/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 59d1b15..0d7dada 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -130,6 +130,43 @@
           </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/293478ae/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index 1e880a2..28ab1a7 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="${basedir}/../build/replace.properties" />
+                        value="${cs.replace.properties}" />
                     </filterreader>
                   </filterchain>
                 </copy>
@@ -118,7 +118,7 @@
                     <filterreader
                       classname="org.apache.tools.ant.filters.ReplaceTokens">
                       <param type="propertiesfile"
-                        value="${basedir}/../build/replace.properties" />
+                        value="${cs.replace.properties}" />
                     </filterreader>
                   </filterchain>
                 </copy>


Mime
View raw message