Skip to content

Commit 78e8d18

Browse files
author
Noa Resare
committed
CLOUDSTACK-1415: Debian & Ubuntu packaging work
Some concepts included: * the replace.properties location used by maven is parameterized to allow for a build that does not modify the currently git tracked files * package naming is updated along the lines of what was discussed on the -dev mailing list and between committers at the Build a Cloud Day in Belgium. * package version pattern is updated (since we redo all package names, we might as well drop the epoch)
1 parent 8444572 commit 78e8d18

39 files changed

Lines changed: 830 additions & 655 deletions

‎agent/pom.xml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<filterreader
8484
classname="org.apache.tools.ant.filters.ReplaceTokens">
8585
<param type="propertiesfile"
86-
value="${basedir}/../build/replace.properties" />
86+
value="${cs.replace.properties}" />
8787
</filterreader>
8888
</filterchain>
8989
</copy>
@@ -97,7 +97,7 @@
9797
<filterreader
9898
classname="org.apache.tools.ant.filters.ReplaceTokens">
9999
<param type="propertiesfile"
100-
value="${basedir}/../build/replace.properties" />
100+
value="${cs.replace.properties}" />
101101
</filterreader>
102102
</filterchain>
103103
</copy>
@@ -106,6 +106,24 @@
106106
</execution>
107107
</executions>
108108
</plugin>
109+
<plugin>
110+
<groupId>org.apache.maven.plugins</groupId>
111+
<artifactId>maven-dependency-plugin</artifactId>
112+
<version>2.5.1</version>
113+
<executions>
114+
<execution>
115+
<id>copy-dependencies</id>
116+
<phase>package</phase>
117+
<goals>
118+
<goal>copy-dependencies</goal>
119+
</goals>
120+
<configuration>
121+
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
122+
<includeScope>runtime</includeScope>
123+
</configuration>
124+
</execution>
125+
</executions>
126+
</plugin>
109127
</plugins>
110128
</build>
111129
</project>

‎awsapi/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
<filterreader
355355
classname="org.apache.tools.ant.filters.ReplaceTokens">
356356
<param type="propertiesfile"
357-
value="${basedir}/../build/replace.properties" />
357+
value="${cs.replace.properties}" />
358358
</filterreader>
359359
</filterchain>
360360
</copy>

‎client/pom.xml‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
<filterreader
305305
classname="org.apache.tools.ant.filters.ReplaceTokens">
306306
<param type="propertiesfile"
307-
value="${basedir}/../build/replace.properties" />
307+
value="${cs.replace.properties}" />
308308
</filterreader>
309309
</filterchain>
310310
</copy>
@@ -315,7 +315,7 @@
315315
<globmapper from="*.in" to="*" />
316316
<filterchain>
317317
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
318-
<param type="propertiesfile" value="${basedir}/../build/replace.properties" />
318+
<param type="propertiesfile" value="${cs.replace.properties}" />
319319
</filterreader>
320320
</filterchain>
321321
</copy>
@@ -326,7 +326,7 @@
326326
<globmapper from="*.in" to="*" />
327327
<filterchain>
328328
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
329-
<param type="propertiesfile" value="${basedir}/../build/replace.properties" />
329+
<param type="propertiesfile" value="${cs.replace.properties}" />
330330
</filterreader>
331331
</filterchain>
332332
</copy>
@@ -337,7 +337,7 @@
337337
<globmapper from="*.in" to="*" />
338338
<filterchain>
339339
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
340-
<param type="propertiesfile" value="${basedir}/../build/replace.properties" />
340+
<param type="propertiesfile" value="${cs.replace.properties}" />
341341
</filterreader>
342342
</filterchain>
343343
</copy>
@@ -347,10 +347,26 @@
347347
</fileset>
348348
<filterchain>
349349
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
350-
<param type="propertiesfile" value="${basedir}/../build/replace.properties" />
350+
<param type="propertiesfile" value="${cs.replace.properties}" />
351351
</filterreader>
352352
</filterchain>
353353
</copy>
354+
<copy overwrite="true" todir="${basedir}/target/conf">
355+
<fileset dir="${basedir}/tomcatconf">
356+
<include name="*.in" />
357+
</fileset>
358+
<globmapper from="*.in" to="*" />
359+
<filterchain>
360+
<filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
361+
<param type="propertiesfile" value="${cs.replace.properties}" />
362+
</filterreader>
363+
</filterchain>
364+
</copy>
365+
<copy overwrite="true" todir="${basedir}/target/conf">
366+
<fileset dir="${basedir}/tomcatconf">
367+
<exclude name="*.in" />
368+
</fileset>
369+
</copy>
354370
</target>
355371
</configuration>
356372
</execution>

‎client/tomcatconf/classpath.conf.in‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,11 @@
1616
# specific language governing permissions and limitations
1717
# under the License.
1818

19-
SYSTEMJARS="@SYSTEMJARS@"
20-
SCP=$(build-classpath $SYSTEMJARS 2>/dev/null) ; if [ $? != 0 ] ; then export SCP="@SYSTEMCLASSPATH@" ; fi
21-
MCP="@MSCLASSPATH@"
22-
DCP="@DEPSCLASSPATH@"
23-
CLASSPATH=$SCP:$DCP:$MCP:@MSCONF@:@SETUPDATADIR@
24-
for jarfile in "@PREMIUMJAVADIR@"/* ; do
25-
if [ ! -e "$jarfile" ] ; then continue ; fi
26-
CLASSPATH=$jarfile:$CLASSPATH
27-
done
28-
for plugin in "@PLUGINJAVADIR@"/* ; do
29-
if [ ! -e "$plugin" ] ; then continue ; fi
30-
CLASSPATH=$plugin:$CLASSPATH
31-
done
32-
for vendorconf in "@MSCONF@"/vendor/* ; do
33-
if [ ! -d "$vendorconf" ] ; then continue ; fi
34-
CLASSPATH=$vendorconf:$CLASSPATH
19+
# We use WEB-INF/lib in the webapp for including things into
20+
# the classpath nowdays
21+
22+
for jar in /usr/share/tomcat6/lib/*.jar; do
23+
CLASSPATH=$jar:$CLASSPATH
3524
done
25+
CLASSPATH=${CLASSPATH}/usr/share/cloudstack-management/webapps/client/WEB-INF/lib/mysql-connector-java-5.1.21.jar
3626
export CLASSPATH
37-
PATH=/sbin:/usr/sbin:$PATH
38-
export PATH

‎debian/README‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎debian/changelog‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
cloudstack (4.1.0-incubating-0.0.snapshot) unstable; urgency=low
2+
3+
* Incorporate incubating into version, remove epoch
4+
5+
-- Noa Resare <noa@spotify.com> Tue, 05 Feb 2013 18:05:28 +0000
6+
17
cloud (1:4.0.0-1) unstable; urgency=low
28

39
* Bumping the version to 4.0.0

‎debian/cloud-agent.config‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎debian/cloud-cli.install‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎debian/cloud-client-ui.install‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎debian/cloud-client.install‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)