- Removed all warnings

- Added base api + provider 
- Cleaned up repos

cnf/build.bnd

@@ -33,10 +33,97 @@ Git-SHA:          		${system-allow-fail;git rev-list -1 HEAD}
 pwd = ${env;REPOSITORY_PASSWORD;}
 usr = ${env;REPOSITORY_USERNAME;}
 
+base.packages =  \
+ 	aQute.bnd.annotation.headers, \
+	aQute.bnd.annotation.licenses, \
+	aQute.bnd.annotation.metatype, \
+	javax.servlet, \
+	javax.servlet.http, \
+  	javax.servlet.annotation, \
+  	javax.servlet.descriptor, \
+  	org.osgi.dto, \
+	org.osgi.annotation.versioning, \
+	org.osgi.framework, \
+	org.osgi.framework.dto, \
+	org.osgi.framework.hooks.bundle, \
+	org.osgi.framework.hooks.resolver, \
+	org.osgi.framework.hooks.service, \
+	org.osgi.framework.hooks.weaving, \
+	org.osgi.framework.launch, \
+	org.osgi.framework.namespace, \
+	org.osgi.framework.startlevel, \
+	org.osgi.framework.startlevel.dto, \
+	org.osgi.framework.wiring, \
+	org.osgi.framework.wiring.dto, \
+	org.osgi.namespace.contract, \
+	org.osgi.namespace.extender, \
+    org.osgi.namespace.implementation, \
+	org.osgi.namespace.service, \
+    org.osgi.service.http.whiteboard, \
+    org.osgi.service.http.context, \
+    org.osgi.service.http.runtime, \
+    org.osgi.service.http.runtime.dto, \
+	org.osgi.resource, \
+	org.osgi.resource.dto, \
+	org.osgi.service.async, \
+	org.osgi.service.async.delegate, \
+	org.osgi.service.cm, \
+	org.osgi.service.component, \
+	org.osgi.service.component.runtime, \
+	org.osgi.service.component.runtime.dto, \
+	org.osgi.service.component.annotations, \
+	org.osgi.service.coordinator, \
+	org.osgi.service.event, \
+	org.osgi.service.http, \
+	org.osgi.service.log, \
+	org.osgi.service.metatype, \
+    org.osgi.service.metatype.annotations, \
+	org.osgi.service.remoteserviceadmin, \
+	org.osgi.service.url, \
+	org.osgi.service.useradmin, \
+	org.osgi.util.function, \
+	org.osgi.util.promise, \
+	org.osgi.util.tracker, \
+	org.slf4j, \
+	osgi.enroute.authentication.api, \
+	osgi.enroute.authorization.api, \
+	osgi.enroute.capabilities, \
+	osgi.enroute.configurer.api, \
+	osgi.enroute.debug.api, \
+	osgi.enroute.dto.api, \
+	osgi.enroute.eventadminserversentevents.capabilities, \
+	osgi.enroute.executor.capabilities, \
+	osgi.enroute.github.angular_ui.capabilities, \
+	osgi.enroute.google.angular.capabilities, \
+	osgi.enroute.http.capabilities, \
+	osgi.enroute.jsplumb.capabilities, \
+	osgi.enroute.iot.admin.api, \
+	osgi.enroute.iot.admin.dto, \
+	osgi.enroute.iot.gpio.api, \
+	osgi.enroute.iot.gpio.util, \
+	osgi.enroute.jsonrpc.api, \
+	osgi.enroute.jsonrpc.dto, \
+	osgi.enroute.launch.api, \
+	osgi.enroute.logger.api, \
+	osgi.enroute.namespace, \
+	osgi.enroute.rest.api,  \
+	osgi.enroute.rootservlet.api, \
+	osgi.enroute.scheduler.api, \
+	osgi.enroute.servlet.api, \
+	osgi.enroute.stackexchange.pagedown.capabilities, \
+	osgi.enroute.twitter.bootstrap.capabilities, \
+	osgi.enroute.webserver.capabilities
+
+
 -connection-settings: ${if;${pwd};server;-dummy};id=https://oss.sonatype.org;username=${usr};password=${pwd}, -bnd
 
+-plugin.enroute.distro = \
+	aQute.bnd.deployer.repository.FixedIndexedRepo; \
+	        name		=       Distro; \
+	        locations	=       https://raw.githubusercontent.com/osgi/osgi.enroute/v1.0.0/cnf/distro/index.xml
+
+
 -plugin.osgi.nexus: \
-\
 	aQute.bnd.repository.maven.provider.MavenBndRepository; \
 		snapshotUrl=https://oss.sonatype.org/content/repositories/osgi-snapshots/; \
 		releaseUrl= 'https://oss.sonatype.org/service/local/staging/deploy/maven2/,http://repo1.maven.org/maven2/'; \
@@ -52,4 +139,4 @@ usr = ${env;REPOSITORY_USERNAME;}
 
 -releaserepo: OSGiNexus
 -baselinerepo: Distro
- 
+

cnf/ext/enroute-distro.bnd

@@ -1,17 +1,11 @@
 #
-# OSGi enRoute Default Distro 
+# OSGi enRoute Default Distro
 #
 # This file defines the properties to be used in an enRoute workspace.
 #
 
 -runfw: org.eclipse.osgi
 
--plugin.enroute.distro = \
-	aQute.bnd.deployer.repository.FixedIndexedRepo; \
-	        name		=       Distro; \
-	        locations	=       https://raw.githubusercontent.com/osgi/osgi.enroute/v1.0.0/cnf/distro/index.xml
-
-
 -runblacklist.enroute:	\
 	osgi.identity;filter:='(osgi.identity=osgi.enroute.base.api)', \
 	osgi.identity;filter:='(osgi.identity=osgi.cmpn)', \
@@ -33,7 +27,7 @@
 -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}
@@ -46,50 +40,3 @@ debug-bundles: \
 	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)'
-
--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=*)'"
-
-
--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)'"
-

cnf/ext/enroute.bnd

@@ -1,6 +1,6 @@
 #
 # -ENROUTE-
-# 
+#
 # This file contains the setup for OSGi enRoute
 #
 
@@ -17,30 +17,3 @@ Service-Component: 		*
 
 test-cases: 			${classes;NAMED;*Test}
 -resolve.effective:		resolve, active
-
--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

cnf/legal/LICENSE

@@ -0,0 +1,13 @@
+   ${Bundle-Copyright}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

cnf/legal/README.md

@@ -0,0 +1,10 @@
+# OSGi enRoute Base Profile
+
+The OSGi enRoute project provides a programming model of OSGi applications. The OSGi specifications provide a powerful and solid platform for component oriented programming but by their nature lack ease of use, especially for newcomers to get started.
+
+This is a bundle providing the API for the OSGi enRoute base profile. The base profile establishes a runtime that contains a minimal set of services that can be used as a base for applications.
+
+The `.api` bundle contains the full API of the base profile. It should be used to compile against. This bundle should **never** be installed in a runtime since it falsely indicates that it provides the base profile capabilities. The `.guard` bundle requires all the capabilities provided in the `.api` bundle. If installed, it will only resolve in the case that all promised capabilities are actually provided.
+
+----
+${bsn} v${Bundle-Version} 

cnf/pom.xml

@@ -17,10 +17,43 @@
 
 		<dependency>
 			<groupId>org.osgi</groupId>
-			<artifactId>osgi.enroute.base.api</artifactId>
-			<version>2.0.0</version>
+			<artifactId>osgi.annotation</artifactId>
+			<version>6.0.1</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.core</artifactId>
+			<version>6.0.0</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.cmpn</artifactId>
+			<version>6.0.0</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.7.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.0</version>
+		</dependency>
+		<dependency>
+		    <groupId>biz.aQute.bnd</groupId>
+		    <artifactId>biz.aQute.bnd.annotation</artifactId>
+		    <version>3.3.0</version>
+		</dependency>
+		<dependency>
+		    <groupId>biz.aQute.bnd</groupId>
+		    <artifactId>biz.aQute.bndlib</artifactId>
+		    <version>3.3.0</version>
+		</dependency>
+
 		<dependency>
 			<groupId>net.sourceforge.htmlunit</groupId>
 			<artifactId>htmlunit</artifactId>

osgi.enroute.base.api/.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test"/>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

osgi.enroute.base.api/.gitignore

@@ -0,0 +1,3 @@
+/bin/
+/bin_test/
+/generated/

osgi.enroute.base.api/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>osgi.enroute.base.api</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

osgi.enroute.base.api/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

osgi.enroute.base.api/.settings/org.eclipse.core.runtime.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n