[cleanup

osgi · Sep 3, 2015 · c0520c1 · c0520c1
1 parent 6403fad
commit c0520c1
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 207 deletions.
diff --git a/cnf/.gitignore b/cnf/.gitignore
@@ -1,3 +1,4 @@
 /generated/
 /bin/
 /cache/
+local/index.*
diff --git a/cnf/distro.json b/cnf/distro.json
diff --git a/cnf/ext/enroute-distro.bnd b/cnf/ext/enroute-distro.bnd
@@ -1,28 +1,27 @@
 #
-# -ENROUTE DISTRO-
-# 
-# This file contains the setup for OSGi enRoute
+# OSGi enRoute Default Distro 
+#
+# This file defines the properties to be used in an enRoute workspace.
 #
 
-# must be removed before release
-bnd-release	=	https://bndtools.ci.cloudbees.com/job/bnd.master/lastSuccessfulBuild/artifact/dist/bundles
+-runfw: org.eclipse.osgi
 
-
--pluginpath:\
-        ${build}/cache/biz.aQute.repository.jar;url=${bnd-release}/biz.aQute.repository/biz.aQute.repository-latest.jar
+-plugin.enroute.distro = \
+	aQute.bnd.deployer.repository.FixedIndexedRepo; \
+	        name		=       Distro; \
+	        locations	=       https://raw.githubusercontent.com/osgi/osgi.enroute/master/cnf/distro/index.xml
+
 
+-runblacklist.enroute:	\
+	osgi.identity;filter:='(osgi.identity=osgi.enroute.base.api)', \
+	osgi.identity;filter:='(osgi.identity=osgi.cmpn)', \
+	osgi.identity;filter:='(osgi.identity=osgi.core)', \
+	osgi.identity;filter:='(osgi.identity=biz.aQute.junit)', \
+	osgi.identity;filter:='(osgi.identity=biz.aQute.launcher)', \
+	osgi.identity;filter:='(osgi.identity=biz.aQute.remote.launcher)'
 
--plugin.enroute.distrorepo = \
-	aQute.bnd.jpm.Repository; \
-	        includeStage	=       true; \
-	        name		=       Distro; \
-	        location	=       ~/.bnd/shacache; \
-	        index		=       ${build}/distro.json; \
-	        depository.group	=		OSGi; \
-    		depository.name		=		enRoute.rt
 
--runfw:							org.eclipse.osgi;version=@3.9.1
--runpath.eqnx:					osgi.enroute.equinox.log.adapter
+# TODO check if still needed
 
 -runproperties.eqnx: 				\
 	org.apache.felix.http.jettyEnabled=true, \
@@ -31,27 +30,66 @@ bnd-release	=	https://bndtools.ci.cloudbees.com/job/bnd.master/lastSuccessfulBui
 	osgi.console=, \
 	org.osgi.service.http.port=8080
 
+-runpath.eqnx: 					osgi.enroute.equinox.log.adapter
+-runrequires.eqnx: \
+	osgi.identity;filter:='(osgi.identity=org.apache.felix.log)'
+
+
 -runsystempackages.eqnx:		javax.script
 -runsystemcapabilities.dflt: 	${native_capability}
 
 debug-bundles: \
 	osgi.identity;filter:='(osgi.identity=aQute.xray.plugin)',\
-	osgi.identity;filter:='(osgi.identity=org.apache.felix.metatype)',\
-	osgi.identity;filter:='(osgi.identity=org.apache.felix.eventadmin)',\
-	osgi.identity;filter:='(osgi.identity=org.apache.felix.log)',\
+	osgi.implementation;filter:='(osgi.implementation=osgi.metatype)',\
+	osgi.implementation;filter:='(osgi.implementation=osgi.log)',\
+	osgi.implementation;filter:='(osgi.implementation=osgi.event)',\
 	osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
 	osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)', \
 	osgi.identity;filter:='(osgi.identity=osgi.enroute.base.debug.provider)'
-
-# 
-# Augments for the Repository Indexer
+
+-augment.kn_ua: \
+	org.knopflerfish.bundle.useradmin; \
+		capability:="osgi.service;objectClass:List<String>=org.osgi.service.useradmin.UserAdmin;effective:=active, \
+					 osgi.implementation;osgi.implementation=osgi.useradmin"
+
+-augment.eq_ev: \
+	org.eclipse.equinox.event; \
+		capability:="  osgi.service;objectClass=org.osgi.service.event.EventAdmin;effective:=active, \
+					   osgi.implementation;osgi.implementation=osgi.event", \
+		requirement:= "osgi.extender;filter:='(osgi.extender=osgi.component)'"
+
 #
+-augment.fe_ht: \
+	org.apache.felix.http.api; \
+		requirement:="osgi.implementation;filter:='(&(osgi.implementation=osgi.http)(version>=1.0.0)(!(version>=2.0)))'"
+
+-augment.os_rs: \
+	org.osgi.service.remoteserviceadmin; \
+		requirement:="osgi.remoteserviceadmin.distribution;filter:='(configs=*)', \
+		              osgi.remoteserviceadmin.topology;filter:='(policy=*)', \
+		              osgi.remoteserviceadmin.discovery;filter:='(protocols=*)'"
 
-org.apache.felix.http.bundle: 		cap=osgi.enroute.whiteboard;osgi.enroute.whiteboard=osgi.enroute.servlet;version:Version=1.1.0;effective:=active, \
-	cap=osgi.service;objectClass=org.osgi.service.http.HttpService;effective:=active
-org.knopflerfish.bundle.useradmin: 	cap=osgi.service;objectClass=org.osgi.service.useradmin.UserAdmin;effective:=active
-org.eclipse.equinox.coordinator: 	cap=osgi.service;objectClass=org.osgi.service.coordinator.Coordinator;effective:=active
-org.apache.felix.scr:				cap=osgi.extender;osgi.extender=osgi.component;version:Version=1.2.1;effective:=active, \
-									cap=osgi.extender;osgi.extender=osgi.ds;version:Version=1.2.1;effective:=active
 
-
+-augment.os_me: \
+	org.osgi.service.metatype; \
+		requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
+
+-augment.os_ev: \
+	org.osgi.service.event; \
+		requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.event)'"
+
+
+-augment.eq_co: \
+	org.eclipse.equinox.coordinator; \
+		capability:= "osgi.service;objectClass=org.osgi.service.coordinator.Coordinator;effective:=active, \
+		              osgi.implementation;osgi.implementation=osgi.coordinator"
+
+-augment.fe_lo: \
+	org.apache.felix.log; \
+		capability:= "osgi.implementation;osgi.implementation=osgi.log"
+
+
+-augment.fe_sc: \
+	org.apache.felix.scr; \
+		requirement:="osgi.implementation;filter:='(osgi.implementation=osgi.metatype)'"
+
diff --git a/cnf/ext/enroute.bnd b/cnf/ext/enroute.bnd
@@ -4,95 +4,43 @@
 # This file contains the setup for OSGi enRoute
 #
 
-bnd-release	=	https://bndtools.ci.cloudbees.com/job/bnd.master/lastSuccessfulBuild/artifact/dist/bundles
 
- 
--pluginpath:\
-        ${build}/cache/biz.aQute.repository.jar;url=${bnd-release}/biz.aQute.repository/biz.aQute.repository-latest.jar
+javac.source: 			1.8
+javac.target: 			1.8
+-runee:					JavaSE-1.8
 
+Service-Component: 		*
+-dsannotations: 		*
+-metatypeannotations:	*
+-contract:				*
 
--plugin.enroute.wrapper: aQute.bnd.deployer.repository.wrapper.Plugin; \
-            location            =	"${build}/cache/wrapper"; \
-            reindex				=	true; \
-            augments			=   WORKSPACE
-
--plugin.enroute.localrepo= \
-	aQute.bnd.deployer.repository.LocalIndexedRepo; \
-		name=Local; \
-		local=${build}/local;\
-		pretty=true
-
--plugin.enroute.centralrepo = \
-	aQute.bnd.jpm.Repository; \
-	        includeStage	=       true; \
-	        name		=       Central; \
-	        location	=       ~/.bnd/shacache; \
-	        index		=       ${build}/repository.json
-
--plugin.enroute.releaserepo = \
-	aQute.bnd.deployer.repository.LocalIndexedRepo; \
-		name=Release; \
-		local=${build}/release;\
-		pretty=true
-
-
--releaserepo: 					Release
-javac.source: 					1.8
-javac.target: 					1.8
-Service-Component: 				*
--dsannotations: 				*
--runee:							JavaSE-1.8
-
-
-
-#
-# Required for testing, these packages are added
-# to the path by aQute.junit
-#
 
-_a = ${if;${def;-osgitest};junit-packages;undefined}
--runsystempackages.junit: ${def; ${_a}}
+test-cases: 			${classes;NAMED;*Test}
+-resolve.effective:		resolve, active
 
-
-junit-packages: \
-	junit.extensions; \
-	junit.framework; \
-	junit.runner; \
-	junit.textui;										version=3.8.2, \
-	org.hamcrest;\
-	org.hamcrest.core; \
-	org.hamcrest.internal;								version=4.11, \
-	org.junit;org.junit.experimental; \
-	org.junit.experimental.categories; \
-	org.junit.experimental.max; \
-  	org.junit.experimental.results; \
-  	org.junit.experimental.runners; \
-  	org.junit.experimental.theories; \
-  	org.junit.experimental.theories.internal; \
-  	org.junit.experimental.theories.suppliers; \
-	org.junit.internal; \
-	org.junit.internal.builders; \
-	org.junit.internal.matchers; \
-	org.junit.internal.requests; \
-	org.junit.internal.runners; \
-	org.junit.internal.runners.model; \
-	org.junit.internal.runners.rules; \
-	org.junit.internal.runners.statements; \
-	org.junit.matchers; \
-	org.junit.rules; \
-	org.junit.runner; \
-	org.junit.runner.manipulation; \
-	org.junit.runner.notification; \
-	org.junit.runners; \
-	org.junit.runners.model; version=4.11
-
-
-test-cases: 					${classes;NAMED;*Test}
-
-#
-# Make sure active dependencies added by bindex are used for resolving
-#
-
--resolve.effective = resolve, active
-
-test-reports: test-results
+-plugin.4.Central:  \
+\
+        aQute.bnd.deployer.repository.wrapper.Plugin; \
+            location            =	"${build}/cache/wrapper"; \
+            reindex				=	true, \
+\
+        aQute.bnd.jpm.Repository; \
+	        includeStaged   	=       true; \
+	        name                =       Central; \
+	        location            =       ~/.bnd/shacache; \
+	        index               =       ${build}/central.json
+
+-plugin.6.Local: \
+        aQute.bnd.deployer.repository.LocalIndexedRepo; \
+            name                =       Local ; \
+            pretty              =       true ; \
+            local               =       ${build}/local
+
+
+
+-plugin.9.Release: \
+\
+        aQute.bnd.deployer.repository.LocalIndexedRepo; \
+            name                =       Release ; \
+            pretty              =       true ; \
+            local               =       ${build}/release
diff --git a/cnf/release/index.xml b/cnf/release/index.xml
diff --git a/cnf/release/index.xml.sha b/cnf/release/index.xml.sha