Merge branch 'master' into 'master'

Master

Added OSGi metainfo to allow deployments to OSGi servers.

See merge request !1

lib/java/Makefile

@@ -17,15 +17,15 @@ all: labcomm.jar labcomm2014.jar labcomm2006.jar
 
 labcomm.jar: gen/JAVAC
 	echo $@
-	cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class
+	cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class
 
 labcomm2014.jar: gen/JAVAC
 	echo $@
-	cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class
+	cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class
 
 labcomm2006.jar: gen/JAVAC
 	echo $@
-	cd gen ; jar cf ../$@ se/lth/control/labcomm2006/*.class
+	cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm2006/*.class
 
 gen:
 	mkdir gen
@@ -39,4 +39,3 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control
 
 clean:
 	rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen
-

lib/java/osgi-manifest.txt

+Bundle-Description: Provides Labcomm to bundles
+Bundle-ManifestVersion: 2
+Bundle-Name: Labcomm OSGi
+Bundle-SymbolicName: se.lth.control.labcomm
+Bundle-Vendor: LTH
+Bundle-Version: 1.0.0
+Export-Package: se.lth.control.labcomm;version="1.0.0",se.lth.control.la
+ bcomm2006;version="1.0.0"