Integrated the service.io project into the main build.

PierreBizouard · Jan 3, 2011 · 63f830b · 63f830b
1 parent 1361c70
commit 63f830b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/ols.distribution/pom.xml b/ols.distribution/pom.xml
@@ -33,19 +33,12 @@
 									<outputDirectory>${project.basedir}/target/bin</outputDirectory>
 								</artifactItem>
 								<artifactItem>
-									<groupId>org.osgi</groupId>
-									<artifactId>org.osgi.compendium</artifactId>
+									<groupId>org.apache.felix</groupId>
+									<artifactId>org.apache.felix.fileinstall</artifactId>
 									<type>jar</type>
 									<overWrite>true</overWrite>
 									<outputDirectory>${project.basedir}/target/bin</outputDirectory>
 								</artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.felix</groupId>
-                                    <artifactId>org.apache.felix.fileinstall</artifactId>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.basedir}/target/bin</outputDirectory>
-                                </artifactItem>
 								<artifactItem>
 									<groupId>com.jgoodies</groupId>
 									<artifactId>looks</artifactId>
@@ -61,6 +54,14 @@
 									<outputDirectory>${project.basedir}/target/bin</outputDirectory>
 								</artifactItem>
 
+								<artifactItem>
+									<groupId>org.osgi</groupId>
+									<artifactId>org.osgi.compendium</artifactId>
+									<type>jar</type>
+									<overWrite>true</overWrite>
+									<outputDirectory>${project.basedir}/target/plugins</outputDirectory>
+								</artifactItem>
+
 								<artifactItem>
 									<groupId>org.apache.felix</groupId>
 									<artifactId>org.apache.felix.log</artifactId>
@@ -97,6 +98,13 @@
 									<overWrite>true</overWrite>
 									<outputDirectory>${project.basedir}/target/plugins</outputDirectory>
 								</artifactItem>
+								<artifactItem>
+									<groupId>nl.lxtreme.ols.service</groupId>
+									<artifactId>io</artifactId>
+									<type>jar</type>
+									<overWrite>true</overWrite>
+									<outputDirectory>${project.basedir}/target/plugins</outputDirectory>
+								</artifactItem>
 								<artifactItem>
 									<groupId>nl.lxtreme.ols</groupId>
 									<artifactId>util</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -117,6 +117,11 @@
 				<artifactId>logging</artifactId>
 				<version>1.0.0</version>
 			</dependency>
+			<dependency>
+				<groupId>nl.lxtreme.ols.service</groupId>
+				<artifactId>io</artifactId>
+				<version>1.0.0</version>
+			</dependency>
 			<dependency>
 				<groupId>nl.lxtreme.ols</groupId>
 				<artifactId>util</artifactId>
@@ -234,6 +239,7 @@
 		<module>rxtx</module>
 		<module>util</module>
 		<module>logging</module>
+		<module>service.io</module>
 		<module>client</module>
 		<module>runner</module>
 		<module>device.test</module>

diff --git a/runner/pom.xml b/runner/pom.xml
@@ -56,6 +56,11 @@
 			<artifactId>logging</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+        <dependency>
+            <groupId>nl.lxtreme.ols.service</groupId>
+            <artifactId>io</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 		<dependency>
 			<groupId>nl.lxtreme.ols</groupId>
 			<artifactId>org.rxtx</artifactId>