From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 16 Apr 2010 16:31:20 +0000 (+0000)
Subject: Introduce SLC SDK RPMs
X-Git-Tag: argeo-slc-2.1.7~1366
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=934b09899fd47ef41788943758338e342267f250;p=gpl%2Fargeo-slc.git

Introduce SLC SDK RPMs

git-svn-id: https://svn.argeo.org/slc/trunk@3469 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 9dea91db0..e334addeb 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -161,14 +161,20 @@
 	<profiles>
 		<profile>
 			<id>rpmbuild</id>
-			<!--
-				<activation> <os> <name>Linux</name> </os> <file>
-				<exists>/usr/bin/rpmbuild</exists> </file> </activation>
-			-->
+
+			<activation>
+				<os>
+					<name>Linux</name>
+				</os>
+				<file>
+					<exists>/usr/bin/rpmbuild</exists>
+				</file>
+			</activation>
+
 			<properties>
 				<package.version>${project.version}</package.version>
 				<distribution.label>argeo</distribution.label>
-				<distribution.root>/net/cash/srv/yumrepos/argeo-el/5/argeo-testing/</distribution.root>
+				<distribution.root>/var/argeo/linux/argeo-el/5/argeo/testing/</distribution.root>
 			</properties>
 			<build>
 				<plugins>
@@ -328,7 +334,6 @@
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
-											<configuration>true</configuration>
 											<sources>
 												<source>
 													<location>../../demo/site</location>
@@ -336,7 +341,9 @@
 														<include>**</include>
 													</includes>
 													<excludes>
-														<exclude>*.pom.xml</exclude>
+														<exclude>pom.xml</exclude>
+														<exclude>target</exclude>
+														<exclude>target/**</exclude>
 														<exclude>.svn</exclude>
 														<exclude>**/.svn/**</exclude>
 													</excludes>
diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini
index 18f864163..6e389c88e 100644
--- a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini
+++ b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini
@@ -1,11 +1,14 @@
-argeo.osgi.start=org.springframework.osgi.extender,\
-	org.argeo.slc.agent,\
-	org.argeo.slc.agent.jms,\
-	org.argeo.slc.support.equinox
+argeo.osgi.start=\
+org.springframework.osgi.extender,\
+org.argeo.slc.agent,\
+org.argeo.slc.agent.jms,\
+org.argeo.slc.support.equinox
 
 log4j.configuration=file:/etc/slc-agent/log4j.properties
 
 # ADVANCED PROPERTIES
 # should not be changed in general
 osgi.bundles=org.argeo.osgi.boot.jar@start
-argeo.osgi.bundles=${osgi.install.area};in=*,${osgi.install.area}/../modules;in=*
+argeo.osgi.bundles=\
+/var/lib/slc-agent/lib;in=*,\
+/var/lib/slc-agent/modules;in=*
diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini
index 45d4ed95a..a63f849ab 100644
--- a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini
+++ b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini
@@ -1,8 +1,9 @@
-argeo.osgi.start=org.springframework.osgi.extender,\
-	org.argeo.server.ads.server,\
-	org.argeo.slc.server.hsqldb,\
-	org.argeo.slc.server.main,\
-	org.argeo.slc.ria
+argeo.osgi.start=\
+org.springframework.osgi.extender,\
+org.argeo.server.ads.server,\
+org.argeo.slc.server.hsqldb,\
+org.argeo.slc.server.main,\
+org.argeo.slc.ria
 
 log4j.configuration=file:/etc/slc-server/log4j.properties
 
@@ -11,5 +12,5 @@ org.osgi.framework.bootdelegation=com.sun.jndi.ldap
 # ADVANCED PROPERTIES
 # should not be changed in general
 osgi.bundles=org.argeo.osgi.boot.jar@start
-argeo.osgi.bundles=${osgi.install.area};in=*
+argeo.osgi.bundles=/var/lib/slc-server/lib;in=*
 	
\ No newline at end of file