Maven introduction

build.xml

@@ -118,7 +118,7 @@
 		</parallel>
 	</target>
 
-	<!-- start cloud demo with tuple spaces as shared memory -->
+	<!-- start convoy demo with tuple spaces as shared memory -->
 	<target name="convoy-ts" description="Runs the convoy demo">
 		<parallel>
 			<antcall target="start-ar"/>

jdeeco-core/.classpath

@@ -6,10 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="../libs/bcel-5.2.jar"/>
-	<classpathentry kind="lib" path="../libs/jsk-lib.jar"/>
-	<classpathentry kind="lib" path="../libs/jsk-platform.jar"/>
-	<classpathentry kind="lib" path="../libs/testng-6.5.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

jdeeco-core/META-INF/MANIFEST.MF

@@ -15,8 +15,8 @@ Export-Package: cz.cuni.mff.d3s.deeco.annotations,
  cz.cuni.mff.d3s.deeco.provider,
  cz.cuni.mff.d3s.deeco.runtime,
  cz.cuni.mff.d3s.deeco.scheduling
-Bundle-Name: cz.cuni.mff.d3s.deeco.jdeeco
-Bundle-SymbolicName: cz.cuni.mff.d3s.jdeeco.coreservices
+Bundle-Name: jDEECo Core
+Bundle-SymbolicName: cz.cuni.mff.d3s.jdeeco.core
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
 

jdeeco-core/build.xml

@@ -2,70 +2,41 @@
 	<description>JDEECo build file</description>
 
 	<!-- compile subprojects -->
-	<target name="compile-jdeeco" description="Compiles the JDEECo runtime sources" >
-		<mkdir dir="${build}/jdeeco"/>
+	<target name="compile-jdeeco" description="Compiles the JDEECo runtime sources">
+		<mkdir dir="${build}/jdeeco" />
 		<javac srcdir="${src}" destdir="${build}/jdeeco" debug="${debug}">
 			<classpath>
-				<pathelement location="${libs}/jsk-lib.jar"/>
-				<pathelement location="${libs}/jsk-platform.jar"/>
-				<pathelement location="${libs}/bcel-5.2.jar"/>
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="compile-demo" depends="dist-jdeeco"
-        description="Compiles the demos sources" >
-		<mkdir dir="${build}/demo"/>
-		<javac srcdir="${demo}" destdir="${build}/demo" debug="${debug}">
-			<classpath>
-				<pathelement location="${libs}/jsk-lib.jar"/>
-				<pathelement location="${libs}/jsk-platform.jar"/>
-				<pathelement location="${dist}/jdeeco.jar"/>
+				<pathelement location="${libs}/jsk-lib.jar" />
+				<pathelement location="${libs}/jsk-platform.jar" />
+				<pathelement location="${libs}/bcel-5.2.jar" />
 			</classpath>
 		</javac>
 	</target>
 
 	<!-- package into jar files -->
-	<target name="dist-jdeeco" depends="compile-jdeeco"
-        description="Generates a jar with JDEECo runtime" >
+	<target name="dist-jdeeco" depends="compile-jdeeco" description="Generates a jar with JDEECo runtime">
 		<jar jarfile="${dist}/jdeeco.jar" basedir="${build}/jdeeco" manifest="${src}/../META-INF/MANIFEST.MF">
-			<fileset dir="${src}/.." includes="OSGI-INF/*.*"/>
+			<fileset dir="${src}/.." includes="OSGI-INF/*.*" />
 		</jar>
 	</target>
 
-	<target name="dist-demo" depends="compile-demo"
-        description="Generates a jar with the demos" >
-		<jar jarfile="${dist}/demo.jar" basedir="${build}/demo"/>
+	<target name="dist-demo" depends="compile-demo" description="Generates a jar with the demos">
+		<jar jarfile="${dist}/demo.jar" basedir="${build}/demo" />
 	</target>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 	<!-- zip source files -->
-	<target name="zip" description="Creates a zip with the source files" >
-		<zip destfile="${dist}/sources.zip">
-	<target name="zip-jdeeco" description="Creates a zip with the source files" >
+	<target name="zip-jdeeco" description="Creates a zip with the source files">
 		<zip destfile="${dist}/sources-jdeeco.zip">
-			<zipfileset dir="${src}"/>
-			<zipfileset dir="${demo}"/>
+			<zipfileset dir="${src}" />
+			<zipfileset dir="${demo}" />
 		</zip>
 	</target>
-	
+
 	<target name="all">
-		<antcall target="dist-demo"/>
-		<antcall target="zip"/>
-		<antcall target="dist-jdeeco"/>
-		<antcall target="zip-jdeeco"/>
+		<antcall target="dist-demo" />
+		<antcall target="zip" />
+		<antcall target="dist-jdeeco" />
+		<antcall target="zip-jdeeco" />
 	</target>
-	
+
 </project>

jdeeco-core/pom.xml

@@ -35,7 +35,7 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
 					<archive>
-					 	<addMavenDescriptor>false</addMavenDescriptor>
+						<addMavenDescriptor>false</addMavenDescriptor>
 						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
 					</archive>
 				</configuration>
@@ -64,4 +64,14 @@
 			<version>6.5.1</version>
 		</dependency>
 	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>release-repo</id>
+			<url>https://github.com/d3scomp/mvn-repo/raw/master/releases</url>
+		</repository>
+		<snapshotRepository>
+			<id>snapshot-repo</id>
+			<url>https://github.com/d3scomp/mvn-repo/raw/master/snapshots</url>
+		</snapshotRepository>
+	</distributionManagement>
 </project>