diff --git a/cnf/build.bnd b/cnf/build.bnd index 9925fe9..f98ba06 100644 --- a/cnf/build.bnd +++ b/cnf/build.bnd @@ -1,10 +1,14 @@ -# -# This file is left open for you to define your macros -# +# OSGi enRoute API -Bundle-License: http://opensource.org/licenses/Apache-2.0 +copyright.year = ${tstamp;yyyy} +copyright = Copyright (c) OSGi Alliance (2014, ${copyright.year}). All Rights Reserved. + +-outputmask: ${@bsn}-${version;===;${@version}}.jar +groupid: org.osgi - +Bundle-Copyright: ${copyright} +Bundle-Vendor: OSGi Alliance http://www.osgi.org/ +Bundle-License: http://opensource.org/licenses/Apache-2.0 -releaserepo: Release -baselinerepo: Distro diff --git a/cnf/ext/enroute.bnd b/cnf/ext/enroute.bnd index 514c61e..55554b9 100644 --- a/cnf/ext/enroute.bnd +++ b/cnf/ext/enroute.bnd @@ -44,3 +44,6 @@ test-cases: ${classes;NAMED;*Test} name = Release ; \ pretty = true ; \ local = ${build}/release + +-pedantic: true +-fixupmessages.enroute="Duplicate","Imports that lack version ranges: *javax" \ No newline at end of file diff --git a/osgi.enroute.authenticator.simple.provider/bnd.bnd b/osgi.enroute.authenticator.simple.provider/bnd.bnd index 718e712..3e8fec3 100644 --- a/osgi.enroute.authenticator.simple.provider/bnd.bnd +++ b/osgi.enroute.authenticator.simple.provider/bnd.bnd @@ -15,15 +15,12 @@ Private-Package: \ Conditional-Package: aQute.lib* -Provide-Capability: \ - osgi.implementation; \ - osgi.implementation=osgi.enroute.authenticator; \ - version:Version=1.0.0 - -buildpath: \ osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit,\ - biz.aQute.bndlib;version=3;packages=* + biz.aQute.bndlib;packages=* + +-testpath: \ + osgi.enroute.junit.wrapper -includeresource: {readme.md} diff --git a/osgi.enroute.authorization.simple.provider/bnd.bnd b/osgi.enroute.authorization.simple.provider/bnd.bnd index 36e4c6c..72e5852 100644 --- a/osgi.enroute.authorization.simple.provider/bnd.bnd +++ b/osgi.enroute.authorization.simple.provider/bnd.bnd @@ -9,27 +9,22 @@ Bundle-Description: \ User Admin roles. For a user, the Authorization object is maintained and \ then all its roles are treated as permission names. The names may contain the \ ';' separator for parameters. - Export-Package: \ osgi.enroute.authorization.api;provide:=true - Private-Package: \ osgi.enroute.authorization.simple.provider Conditional-Package: aQute.lib* -Provide-Capability: \ - osgi.implementation; \ - osgi.implementation=osgi.enroute.authority; \ - version:Version=1.0.0 - - -buildpath: \ osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit,\ - biz.aQute.bndlib;version=3;packages=* + biz.aQute.bndlib;packages=* + +-testpath: \ + osgi.enroute.junit.wrapper + --includeresource: {readme.md} +-includeresource: {readme.md}, LICENSE.txt=${build}/licenses/ASL-2.0.txt -runrequires: \ diff --git a/osgi.enroute.base.debug.provider/bnd.bnd b/osgi.enroute.base.debug.provider/bnd.bnd index 2e8a2d9..1308892 100644 --- a/osgi.enroute.base.debug.provider/bnd.bnd +++ b/osgi.enroute.base.debug.provider/bnd.bnd @@ -15,10 +15,13 @@ Export-Package: osgi.enroute.debug.api -buildpath: \ - osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit + osgi.enroute.base.api;version=1.0 --includeresource: {readme.md} +-testpath: \ + osgi.enroute.junit.wrapper + + +-includeresource: {readme.md}, LICENSE.txt=${build}/licenses/ASL-2.0.txt -runrequires: \ diff --git a/osgi.enroute.base.test/bnd.bnd b/osgi.enroute.base.test/bnd.bnd index 2973558..526c1e6 100644 --- a/osgi.enroute.base.test/bnd.bnd +++ b/osgi.enroute.base.test/bnd.bnd @@ -9,19 +9,18 @@ Bundle-Description: \ Conditional-Package: aQute.lib* Private-Package: osgi.enroute.*.test - +Import-Package: com.gargoylesoftware.*;version=0,* Test-Cases: ${test-cases} --includeresource: {readme.md} +-includeresource: {readme.md}, LICENSE.txt=${build}/licenses/ASL-2.0.txt + +-buildpath: \ + osgi.enroute.base.api;version=1.0,\ + biz.aQute.bndlib;packages=*, \ + osgi.enroute.junit.wrapper,\ + net.sourceforge.htmlunit;version=2.15 --buildpath: \ - osgi.enroute.base.api;version=1.4,\ - biz.aQute.junit,\ - biz.aQute.bndlib;version=2.3;packages=*,\ - net.sourceforge.htmlunit;version=2.15,\ - org.apache.felix.scr - -runrequires: \ osgi.identity;filter:='(osgi.identity=osgi.enroute.base.test)',\ diff --git a/osgi.enroute.configurer.simple.provider/bnd.bnd b/osgi.enroute.configurer.simple.provider/bnd.bnd index 3892a03..e6ecfea 100644 --- a/osgi.enroute.configurer.simple.provider/bnd.bnd +++ b/osgi.enroute.configurer.simple.provider/bnd.bnd @@ -1,4 +1,4 @@ -# +1# # OSGI ENROUTE CONFIGURER SIMPLE PROVIDER BUNDLE # @@ -8,20 +8,23 @@ Bundle-Description: This component is an extender that reads the /configuratio and installs the list of maps in there as configuration. The configurer supports a number of features \ like profiles, macro expansion, binary resource handling, and configuration through system properties. \ See the readme.md file for more details. - - Private-Package: \ osgi.enroute.configurer.simple.provider +Export-Package: \ + osgi.enroute.configurer.api;provide:=true + Conditional-Package: aQute.lib* -buildpath: \ osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit,\ biz.aQute.bndlib;packages=* --includeresource: {readme.md} +-testpath: \ + osgi.enroute.junit.wrapper + +-includeresource: {readme.md}, LICENSE.txt=${build}/licenses/ASL-2.0.txt -runrequires: \ @@ -34,6 +37,3 @@ Conditional-Package: aQute.lib* org.eclipse.equinox.coordinator;version='[1.2.0,1.2.1)',\ osgi.configurer.provider;version='[1.0.0,1.0.1)',\ osgi.enroute.configurer.simple.provider;version=latest -Export-Package: \ - osgi.enroute.configurer.api;provide:=true,\ - osgi.enroute.configurer.capabilities \ No newline at end of file diff --git a/osgi.enroute.easse.simple.adapter/bnd.bnd b/osgi.enroute.easse.simple.adapter/bnd.bnd index 985b926..a42f2ba 100644 --- a/osgi.enroute.easse.simple.adapter/bnd.bnd +++ b/osgi.enroute.easse.simple.adapter/bnd.bnd @@ -10,25 +10,29 @@ Bundle-Description: \ will then send all matching events to the browser through SSE. The type \ of the event is org.osgi.service.eventadmin;topic=%s, the data payload \ is a JSON representation of the event properties. - - +Export-Package: \ + osgi.enroute.eventadminserversentevents.capabilities Private-Package: \ osgi.enroute.easse.simple.adapter - -Conditional-Package: aQute.lib* - + +# TODO update to packageattribute Provide-Capability: \ osgi.enroute.webresource; \ osgi.enroute.webresource=/osgi/enroute/easse; \ root=/static/osgi/enroute/easse; \ - version:Version=${Bundle-Version} + version:Version=1.0.0 + +Conditional-Package: aQute.lib* + -buildpath: \ osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit, \ biz.aQute.bndlib;packages=* --includeresource: {readme.md}, {static=static} +-testpath: \ + osgi.enroute.junit.wrapper + +-includeresource: {readme.md}, {static=static}, LICENSE.txt=${build}/licenses/ASL-2.0.txt -runrequires: \ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.runtime)',\ @@ -67,4 +71,3 @@ Provide-Capability: \ -runtrace=true -Export-Package: osgi.enroute.easse.capabilities \ No newline at end of file diff --git a/osgi.enroute.equinox.log.adapter/bnd.bnd b/osgi.enroute.equinox.log.adapter/bnd.bnd index 9b00e98..585df84 100644 --- a/osgi.enroute.equinox.log.adapter/bnd.bnd +++ b/osgi.enroute.equinox.log.adapter/bnd.bnd @@ -15,10 +15,12 @@ Private-Package: \ Embedded-Activator: osgi.enroute.equinox.log.adapter.HideEquinoxLog -buildpath: \ - osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit + osgi.enroute.base.api;version=1.0 + +-testpath: \ + osgi.enroute.junit.wrapper --includeresource: {readme.md} +-includeresource: {readme.md}, LICENSE.txt=${build}/licenses/ASL-2.0.txt -runrequires: \ diff --git a/osgi.enroute.executor.simple.provider/bnd.bnd b/osgi.enroute.executor.simple.provider/bnd.bnd index 38836eb..482d930 100644 --- a/osgi.enroute.executor.simple.provider/bnd.bnd +++ b/osgi.enroute.executor.simple.provider/bnd.bnd @@ -6,7 +6,6 @@ Bundle-Version: 1.0.0.${tstamp} Bundle-Description: \ This bundle provides an Executor service. - Private-Package: \ osgi.enroute.executor.simple.provider @@ -14,7 +13,7 @@ Private-Package: \ osgi.enroute.base.api;version=1.0, \ biz.aQute.bndlib --includeresource: {readme.md} +-includeresource: {readme.md}, LICENSE.txt=${build}/licenses/ASL-2.0.txt -runrequires: \ diff --git a/osgi.enroute.github.angular-ui.webresource/LICENSE.txt b/osgi.enroute.github.angular-ui.webresource/LICENSE.txt new file mode 100644 index 0000000..f61feea --- /dev/null +++ b/osgi.enroute.github.angular-ui.webresource/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2012-2015 the AngularUI Team, https://github.com/organizations/angular-ui/teams/291112 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/osgi.enroute.github.angular-ui.webresource/bnd.bnd b/osgi.enroute.github.angular-ui.webresource/bnd.bnd index a11cafc..62ee3f6 100644 --- a/osgi.enroute.github.angular-ui.webresource/bnd.bnd +++ b/osgi.enroute.github.angular-ui.webresource/bnd.bnd @@ -21,7 +21,8 @@ Bundle-DocURL: http://angular-ui.github.io/bootstrap/ Bundle-SCM: git@github.com:angular-ui/bootstrap.git Bundle-License: http://opensource.org/licenses/MIT;link = "http://en.wikipedia.org/wiki/MIT_License";description = "MIT License" Bundle-Icon: https://2.gravatar.com/avatar/46d07086561c66caae16ce4d96bfd345?d=https%3A%2F%2Fidenticons.github.com%2F3902b30e7e55d0ffde5994d69bf8d4e6.png&s=64 -Export-Package: osgi.enroute.github.angular_ui.capabilities +Export-Package: osgi.enroute.github.angular_ui.capabilities;-split-package:=first +Bundle-Copyright: Copyright (c) 2012-${tstamp;YYYY} the AngularUI Team, https://github.com/organizations/angular-ui/teams/291112 Provide-Capability: \ osgi.enroute.webresource; \ @@ -29,7 +30,7 @@ Provide-Capability: \ root=${path}; \ version:Version=${vrs} --includeresource: ${path}=${vrs}, {readme.md} +-includeresource: ${path}=${vrs}, {readme.md}, LICENSE.txt -buildpath: \ osgi.enroute.base.api diff --git a/osgi.enroute.github.angular-ui.webresource/src/osgi/enroute/github/angular_ui/capabilities/package-info.java b/osgi.enroute.github.angular-ui.webresource/src/osgi/enroute/github/angular_ui/capabilities/package-info.java new file mode 100644 index 0000000..b3c7079 --- /dev/null +++ b/osgi.enroute.github.angular-ui.webresource/src/osgi/enroute/github/angular_ui/capabilities/package-info.java @@ -0,0 +1,2 @@ +@org.osgi.annotation.versioning.Version(osgi.enroute.github.angular_ui.capabilities.AngularUIConstants.ANGULAR_UI_WEBRESOURCE_VERSION) +package osgi.enroute.github.angular_ui.capabilities; \ No newline at end of file diff --git a/osgi.enroute.google.angular.webresource/LICENSE.txt b/osgi.enroute.google.angular.webresource/LICENSE.txt new file mode 100644 index 0000000..1fa4ed5 --- /dev/null +++ b/osgi.enroute.google.angular.webresource/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2010-2015 Google, Inc. http://angularjs.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/osgi.enroute.google.angular.webresource/bnd.bnd b/osgi.enroute.google.angular.webresource/bnd.bnd index 7cc1923..8b68747 100644 --- a/osgi.enroute.google.angular.webresource/bnd.bnd +++ b/osgi.enroute.google.angular.webresource/bnd.bnd @@ -19,8 +19,9 @@ Bundle-License: http://opensource.org/licenses/MIT Bundle-DocURL: http://angularjs.org/ Bundle-Vendor: Google Inc. (bundled by OSGi enRoute) Bundle-Icon: angular.png -Bundle-License: http://opensource.org/licenses/MIT";link = "http://en.wikipedia.org/wiki/MIT_License";description = "MIT License" -Export-Package: osgi.enroute.github.angular.capabilities +Bundle-License: http://opensource.org/licenses/MIT" +Export-Package: osgi.enroute.google.angular.capabilities;-split-package:=first +Bundle-Copyright: Copyright (c) 2010-${tstamp;YYYY} Google, Inc. http://angularjs.org Provide-Capability: \ osgi.enroute.webresource; \ osgi.enroute.webresource=${name}; \ @@ -30,7 +31,7 @@ Provide-Capability: \ -buildpath: \ osgi.enroute.base.api --includeresource: ${path}=${vrs}, angular.png, {readme.md} +-includeresource: ${path}=${vrs}, angular.png, {readme.md}, LICENSE.txt -runrequires: \ osgi.identity;filter:='(osgi.identity=osgi.enroute.google.angular.webresource)' diff --git a/osgi.enroute.google.angular.webresource/src/osgi/enroute/google/angular/capabilities/package-info.java b/osgi.enroute.google.angular.webresource/src/osgi/enroute/google/angular/capabilities/package-info.java new file mode 100644 index 0000000..f3355e2 --- /dev/null +++ b/osgi.enroute.google.angular.webresource/src/osgi/enroute/google/angular/capabilities/package-info.java @@ -0,0 +1,2 @@ +@org.osgi.annotation.versioning.Version(osgi.enroute.google.angular.capabilities.AngularConstants.ANGULAR_WEB_RESOURCE_VERSION) +package osgi.enroute.google.angular.capabilities; \ No newline at end of file diff --git a/osgi.enroute.hamcrest.wrapper/LICENSE.txt b/osgi.enroute.hamcrest.wrapper/LICENSE.txt new file mode 100644 index 0000000..e3d4feb --- /dev/null +++ b/osgi.enroute.hamcrest.wrapper/LICENSE.txt @@ -0,0 +1,27 @@ +BSD License + +Copyright (c) 2000-2006, www.hamcrest.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. Redistributions in binary form must reproduce +the above copyright notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the distribution. + +Neither the name of Hamcrest nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. \ No newline at end of file diff --git a/osgi.enroute.hamcrest.wrapper/bnd.bnd b/osgi.enroute.hamcrest.wrapper/bnd.bnd index 844375d..a6c9252 100644 --- a/osgi.enroute.hamcrest.wrapper/bnd.bnd +++ b/osgi.enroute.hamcrest.wrapper/bnd.bnd @@ -1,7 +1,10 @@ Bundle-Version: 1.3.0.${tstamp} -Export-Package: *;version=1.3.0 -Import-Package: *;resolution:=optional +Export-Package: *;version=1.3.0 +Import-Package: *;resolution:=optional +Bundle-License: http://opensource.org/licenses/BSD-2-Clause - --buildpath: org.hamcrest__hamcrest-all;version=1.3 \ No newline at end of file +-buildpath: \ + org.hamcrest__hamcrest-all;version=1.3 + +-includeresource: LICENSE.txt diff --git a/osgi.enroute.iot.circuit.application/bnd.bnd b/osgi.enroute.iot.circuit.application/bnd.bnd index a8e4124..35e32f5 100644 --- a/osgi.enroute.iot.circuit.application/bnd.bnd +++ b/osgi.enroute.iot.circuit.application/bnd.bnd @@ -6,9 +6,7 @@ Bundle-Version: 1.0.2.${tstamp} Bundle-Description: \ A GUI for the Circuit Admin. This application shows the registered ICs + wires \ and can wire ICs together. - EnRoute-Application: osgi.enroute.iot.circuit - Private-Package: \ osgi.enroute.iot.circuit.application @@ -16,12 +14,11 @@ Private-Package: \ {readme.md}, \ {configuration=configuration}, \ {static=static}, \ - web=web - + web=web, \ + LICENSE.txt=${build}/licenses/ASL-2.0.txt + -buildpath: \ - osgi.enroute.base.api,\ - osgi.enroute.google.angular.webresource;version=latest, \ - osgi.enroute.twitter.bootstrap.webresource;version=latest + osgi.enroute.base.api -runrequires: \ diff --git a/osgi.enroute.iot.circuit/bnd.bnd b/osgi.enroute.iot.circuit/bnd.bnd index 0fc0782..861f422 100644 --- a/osgi.enroute.iot.circuit/bnd.bnd +++ b/osgi.enroute.iot.circuit/bnd.bnd @@ -3,11 +3,18 @@ # Bundle-Version: 1.0.0.${tstamp} - + +Conditional-Package: aQute.lib* + + -buildpath: \ - osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit,\ - biz.aQute.bndlib;version=3;packages=* + osgi.enroute.base.api;version=1.0, \ + biz.aQute.bndlib;packages=* + +-testpath: \ + osgi.enroute.junit.wrapper -sub: \ *.bnd + +-includeresource.license: LICENSE.txt=${build}/licenses/ASL-2.0.txt \ No newline at end of file diff --git a/osgi.enroute.iot.circuit/command.bnd b/osgi.enroute.iot.circuit/command.bnd index 0f2835e..5660835 100644 --- a/osgi.enroute.iot.circuit/command.bnd +++ b/osgi.enroute.iot.circuit/command.bnd @@ -2,13 +2,12 @@ # OSGI ENROUTE IOT CIRCUIT GOGO COMMAND BUNDLE (circuit) # +Bundle-Version: 1.0.1.${tstamp} Bundle-Description: \ Commands for the Circuit Admin. These command can connect, disconnect, and \ and show information abou the current circuit board. - Private-Package: \ osgi.enroute.iot.circuit.command -includeresource: {readme.md} -Bundle-Version: 1.0.1.${tstamp} \ No newline at end of file diff --git a/osgi.enroute.iot.circuit/provider.bnd b/osgi.enroute.iot.circuit/provider.bnd index 4608595..c1103c4 100644 --- a/osgi.enroute.iot.circuit/provider.bnd +++ b/osgi.enroute.iot.circuit/provider.bnd @@ -2,22 +2,20 @@ # OSGI ENROUTE IOT CIRCUIT BUNDLE # +Bundle-Version: 2.0.1.${tstamp} Bundle-Description: \ Implements a Circuit Board for ICs. ICs have inputs and outputs. The Circuit board \ can fire events to the ICs and ICs can fire events to the board. The board then dispatches \ the event to the connected inputs. - -Conditional-Package: aQute.lib* - Export-Package: \ - osgi.enroute.iot.admin.dto,\ - osgi.enroute.iot.admin.api,\ - osgi.enroute.iot.gpio.api,\ - osgi.enroute.iot.gpio.util - + osgi.enroute.iot.admin.dto;provide:=true,\ + osgi.enroute.iot.admin.api;provide:=true,\ + osgi.enroute.iot.gpio.api;provide:=true,\ + osgi.enroute.iot.gpio.util;provide:=true Private-Package: \ osgi.enroute.iot.circuit.provider,\ osgi.enroute.iot.toolkit + + -includeresource: {readme.md} -Bundle-Version: 2.0.1.${tstamp} \ No newline at end of file diff --git a/osgi.enroute.iot.lego.adapter/bnd.bnd b/osgi.enroute.iot.lego.adapter/bnd.bnd index b8d25d1..23e2ae7 100644 --- a/osgi.enroute.iot.lego.adapter/bnd.bnd +++ b/osgi.enroute.iot.lego.adapter/bnd.bnd @@ -8,7 +8,6 @@ Bundle-Description: \ This bundle implements an IC that takes as input the A & B motor controls from the \ Lego IR adapter. It translates these controls to an IR Wave that is compatbile with \ the lirc adapter on the Raspberry PI. - Private-Package: \ osgi.enroute.iot.lego.adapter @@ -17,16 +16,13 @@ Conditional-Package: aQute.lib* -buildpath: \ osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit,\ biz.aQute.bndlib;packages=* --includeresource: {readme.md} +-testpath: \ + osgi.enroute.junit.wrapper + +-includeresource: {readme.md}, LICENSE.txt=${build}/licenses/ASL-2.0.txt --runrequires: \ - osgi.identity;filter:='(osgi.identity=osgi.enroute.iot.lirc.adapter)' - -runbundles: \ ${error;Resolve first} - --dsannotations: * \ No newline at end of file diff --git a/osgi.enroute.iot.pi/LICENSE.txt b/osgi.enroute.iot.pi/LICENSE.txt new file mode 100644 index 0000000..cca7fc2 --- /dev/null +++ b/osgi.enroute.iot.pi/LICENSE.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/osgi.enroute.iot.pi/NOTICE.txt b/osgi.enroute.iot.pi/NOTICE.txt new file mode 100644 index 0000000..dd7e424 --- /dev/null +++ b/osgi.enroute.iot.pi/NOTICE.txt @@ -0,0 +1,33 @@ + ========================================================================= + Pi4J :: Java library for Raspberry Pi + ========================================================================= + + Pi4J Library + Copyright (C) 2012-2015 Pi4J.com + + This product includes software developed at: + The Pi4J Project (http://www.pi4j.com/). + + This product was originally authored by: Robert Savage + + This software is licensed under the GNU LGPLv3 license. + More information about licensing terms can be found at: + http://pi4j.com/license.html + + Additional information about this project and its authors can be found at: + - http://www.pi4j.com/ + - http://www.raspicentral.com + - http://www.savagehomeautomation.com + + This software compiles against libraries from the WiringPi project. + The Wiring Pi project is provided by Gordon Henderson and is available + from + http://wiringpi.com/ + + The WiringPi project is licensed under the GNU LGPLv3 license + http://www.gnu.org/licenses/lgpl.html + + ========================================================================= + Subject to the terms of the software license, this NOTICE file must be + included in any Derivative Works that You distribute as a readable copy. + (Section 4d) diff --git a/osgi.enroute.iot.pi/bnd.bnd b/osgi.enroute.iot.pi/bnd.bnd index ffefc58..72213db 100644 --- a/osgi.enroute.iot.pi/bnd.bnd +++ b/osgi.enroute.iot.pi/bnd.bnd @@ -12,8 +12,13 @@ Bundle-Description: \ template for all the Pi's functions. The GPIO's are registered as components for the circuit. \ Regardless of the success of the configuration, this bundle \ will also register a GpioController service, which is the main Pi4J class. - - +Bundle-License: http://opensource.org/licenses/lgpl-3.0.html +Bundle-Copyright: Copyright (C) 2012-2015 Pi4J.com, Gordon Henderson of wiringpi.com +Bundle-DocURL: \ + http://www.pi4j.com, \ + http://www.raspicentral.com, \ + http://www.savagehomeautomation.com + Conditional-Package: aQute.lib* -buildpath: \ @@ -23,6 +28,8 @@ Conditional-Package: aQute.lib* org.apache.felix.gogo.runtime,\ jar/pi4j-core.jar;version=file +-includeresource.license = LICENSE.txt, NOTICE.txt, @jar/pi4j-core.jar!/README.md + -sub: \ *.bnd diff --git a/osgi.enroute.iot.pi/readme.md b/osgi.enroute.iot.pi/readme.md index 446fc85..7506ee1 100644 --- a/osgi.enroute.iot.pi/readme.md +++ b/osgi.enroute.iot.pi/readme.md @@ -2,7 +2,4 @@ ${Bundle-Description} -## Example - -## References diff --git a/osgi.enroute.iot.rf522.adapter/.classpath b/osgi.enroute.iot.rf522.adapter/.classpath index 055bdc3..57c70f3 100644 --- a/osgi.enroute.iot.rf522.adapter/.classpath +++ b/osgi.enroute.iot.rf522.adapter/.classpath @@ -2,7 +2,7 @@ - + diff --git a/osgi.enroute.iot.rf522.adapter/bnd.bnd b/osgi.enroute.iot.rf522.adapter/bnd.bnd index ddcb65d..4ab508b 100644 --- a/osgi.enroute.iot.rf522.adapter/bnd.bnd +++ b/osgi.enroute.iot.rf522.adapter/bnd.bnd @@ -14,8 +14,10 @@ Private-Package: \ osgi.enroute.iot.rf522.adapter -buildpath: \ - osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit + osgi.enroute.base.api;version=1.0 + +-testpath: \ + osgi.enroute.junit.wrapper -includeresource: {readme.md} diff --git a/osgi.enroute.jsonrpc.simple.provider/bnd.bnd b/osgi.enroute.jsonrpc.simple.provider/bnd.bnd index 38aa13d..aaea224 100644 --- a/osgi.enroute.jsonrpc.simple.provider/bnd.bnd +++ b/osgi.enroute.jsonrpc.simple.provider/bnd.bnd @@ -9,29 +9,30 @@ Bundle-Description: \ tracks any JSONRPC services. It assumes all public methods on the implementation \ class are fair game and maps to them to a JSON RPC endpoint. These methods are then available in Javascript. - Export-Package: \ - osgi.enroute.jsonrpc.api,\ - osgi.enroute.jsonrpc.dto,\ - osgi.enroute.jsonrpc.capabilities + osgi.enroute.jsonrpc.api;provide:=true,\ + osgi.enroute.jsonrpc.dto;provide:=true Private-Package: \ osgi.enroute.jsonrpc.simple.provider +# TODO update once we got ${packageattribute} Provide-Capability: \ osgi.enroute.webresource; \ osgi.enroute.webresource=/osgi/enroute/jsonrpc; \ root=/static/osgi/enroute/jsonrpc; \ - version:Version=${Bundle-Version} + version:Version=1.0.0 Conditional-Package: aQute.lib* -buildpath: \ osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit,\ biz.aQute.bndlib;packages=* --includeresource: {readme.md}, {static=static} +-testpath: \ + osgi.enroute.junit.wrapper + +-includeresource: {readme.md}, {static=static}, LICENSE.txt=${build}/licenses/ASL-2.0.txt -runrequires: \ diff --git a/osgi.enroute.jsonrpc.simple.provider/readme.md b/osgi.enroute.jsonrpc.simple.provider/readme.md index cbbc2f7..96921dd 100644 --- a/osgi.enroute.jsonrpc.simple.provider/readme.md +++ b/osgi.enroute.jsonrpc.simple.provider/readme.md @@ -2,14 +2,7 @@ ${Bundle-Description} -## Example +## Disclaimer -## Configuration - - Pid: osgi.enroute.jsonrpc.simple - - Field Type Description - - -## References +This bundle does not support JSONRPC 2.0 combined requests diff --git a/osgi.enroute.jsplumb.webresource/LICENSE.txt b/osgi.enroute.jsplumb.webresource/LICENSE.txt new file mode 100644 index 0000000..3775870 --- /dev/null +++ b/osgi.enroute.jsplumb.webresource/LICENSE.txt @@ -0,0 +1,20 @@ +Copyright (c) 2010 - 2014 jsPlumb, http://jsplumbtoolkit.com/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/osgi.enroute.jsplumb.webresource/bnd.bnd b/osgi.enroute.jsplumb.webresource/bnd.bnd index 0d7358d..a4ec76f 100644 --- a/osgi.enroute.jsplumb.webresource/bnd.bnd +++ b/osgi.enroute.jsplumb.webresource/bnd.bnd @@ -12,10 +12,10 @@ Bundle-Version: ${vrs}.${tstamp} Bundle-Description: \ jsPlumb provides a means for a developer to visually connect elements \ on their web pages. It uses SVG or Canvas in modern browsers. -Export-Package: osgi.enroute.jsplumb.capabilities -Bundle-License: http://opensource.org/licenses/MIT +Bundle-License: http://opensource.org/licenses/MIT, link="https://github.com/sporritt/jsPlumb/blob/master/jsPlumb-MIT-LICENSE.txt" Bundle-DocURL: http://jsplumb.org/doc/home.html Bundle-Icon: https://jsplumbtoolkit.com/img/logo-jsplumb-green.png +Export-Package: osgi.enroute.jsplumb.capabilities;-split-package:=first Provide-Capability: \ osgi.enroute.webresource; \ @@ -23,7 +23,10 @@ Provide-Capability: \ root=${path}; \ version:Version=${vrs} --includeresource: ${path}=${vrs}, {readme.md} +-includeresource: ${path}=${vrs}, {readme.md}, LICENSE.txt -buildpath: \ osgi.enroute.base.api + +# TODO figure out why we need this? +-fixupmessages: "Version for package osgi.enroute.jsplumb.capabilities is set to different values in the source" \ No newline at end of file diff --git a/osgi.enroute.jsplumb.webresource/src/osgi/enroute/jsplumb/capabilities/package-info.java b/osgi.enroute.jsplumb.webresource/src/osgi/enroute/jsplumb/capabilities/package-info.java new file mode 100644 index 0000000..6669213 --- /dev/null +++ b/osgi.enroute.jsplumb.webresource/src/osgi/enroute/jsplumb/capabilities/package-info.java @@ -0,0 +1,2 @@ +@org.osgi.annotation.versioning.Version(osgi.enroute.jsplumb.capabilities.JsplumbConstants.JSPLUMB_WEB_RESOURCE_VERSION) +package osgi.enroute.jsplumb.capabilities; \ No newline at end of file diff --git a/osgi.enroute.junit.wrapper/LICENSE.txt b/osgi.enroute.junit.wrapper/LICENSE.txt new file mode 100644 index 0000000..fb68629 --- /dev/null +++ b/osgi.enroute.junit.wrapper/LICENSE.txt @@ -0,0 +1,214 @@ +JUnit + +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial code and + documentation distributed under this Agreement, and + b) in the case of each subsequent Contributor: + + i) changes to the Program, and + + ii) additions to the Program; + + where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are +not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents " mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and +such derivative works, in source code and object code form. + + b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under +Licensed Patents to make, use, sell, offer to sell, import and otherwise +transfer the Contribution of such Contributor, if any, in source code and +object code form. This patent license shall apply to the combination of the +Contribution and the Program if, at the time the Contribution is added by the +Contributor, such addition of the Contribution causes such combination to be +covered by the Licensed Patents. The patent license shall not apply to any +other combinations which include the Contribution. No hardware per se is +licensed hereunder. + + c) Recipient understands that although each Contributor grants the +licenses to its Contributions set forth herein, no assurances are provided by +any Contributor that the Program does not infringe the patent or other +intellectual property rights of any other entity. Each Contributor disclaims +any liability to Recipient for claims brought by any other entity based on +infringement of intellectual property rights or otherwise. As a condition to +exercising the rights and licenses granted hereunder, each Recipient hereby +assumes sole responsibility to secure any other intellectual property rights +needed, if any. For example, if a third party patent license is required to +allow Recipient to distribute the Program, it is Recipient's responsibility to +acquire that license before distributing the Program. + + d) Each Contributor represents that to its knowledge it has sufficient +copyright rights in its Contribution, if any, to grant the copyright license +set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under +its own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + + b) its license agreement: + + i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title +and non-infringement, and implied warranties or conditions of merchantability +and fitness for a particular purpose; + + ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + + iii) states that any provisions which differ from this Agreement are +offered by that Contributor alone and not by any other party; and + + iv) states that source code for the Program is available from such +Contributor, and informs licensees how to obtain it in a reasonable manner on +or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + + b) a copy of this Agreement must be included with each copy of the +Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor +to control, and cooperate with the Commercial Contributor in, the defense and +any related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using +and distributing the Program and assumes all risks associated with its exercise +of rights under this Agreement, including but not limited to the risks and +costs of program errors, compliance with applicable laws, damage to or loss of +data, programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against any +entity (including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software or +hardware) infringes such Recipient's patent(s), then such Recipient's rights +granted under Section 2(b) shall terminate as of the date such litigation is +filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue +and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to +serve as the Agreement Steward to a suitable separate entity. Each new version +of the Agreement will be given a distinguishing version number. The Program +(including Contributions) may always be distributed subject to the version of +the Agreement under which it was received. In addition, after a new version of +the Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly stated +in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to +the intellectual property of any Contributor under this Agreement, whether +expressly, by implication, estoppel or otherwise. All rights in the Program not +expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial +in any resulting litigation. + diff --git a/osgi.enroute.junit.wrapper/bnd.bnd b/osgi.enroute.junit.wrapper/bnd.bnd index f4ee9a8..bbeae72 100644 --- a/osgi.enroute.junit.wrapper/bnd.bnd +++ b/osgi.enroute.junit.wrapper/bnd.bnd @@ -1,15 +1,14 @@ -Bundle-Version: 4.12.0.${tstamp} +Bundle-Version: 4.12.0.${tstamp} Bundle-Description: \ JUnit is a simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks. \ This bundle wraps JUnit as is and exports all packages with the bundle version since JUnit has not understood package versioning, \ nor semantic versioning. We also make imports optional since it has - - +Bundle-License: http://opensource.org/licenses/EPL-1.0 Export-Package: \ *junit*;version=4.12 - , \ - org.hamcrest.*;version=1.3.0 +Import-Package:\ + org.hamcrest.*;version=1.3.0, * #Import-Package: \ org.apache.tools.ant.*;resolution:=optional, \ @@ -20,6 +19,4 @@ Export-Package: \ -buildpath: \ junit__junit - - , \ - org.hamcrest__hamcrest-all \ No newline at end of file +-includeresource: LICENSE.txt \ No newline at end of file diff --git a/osgi.enroute.logger.simple.provider/LICENSE.txt b/osgi.enroute.logger.simple.provider/LICENSE.txt new file mode 100644 index 0000000..e945392 --- /dev/null +++ b/osgi.enroute.logger.simple.provider/LICENSE.txt @@ -0,0 +1,21 @@ +Copyright (c) 2004-2013 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/osgi.enroute.logger.simple.provider/bnd.bnd b/osgi.enroute.logger.simple.provider/bnd.bnd index c61eb85..aa78f57 100644 --- a/osgi.enroute.logger.simple.provider/bnd.bnd +++ b/osgi.enroute.logger.simple.provider/bnd.bnd @@ -6,26 +6,27 @@ Bundle-Version: 1.1.1.${tstamp} Bundle-Description: \ Provides a simple implementation of the OSGi SLF4J bridge, includes shell command - - Export-Package: \ osgi.enroute.logger.api;provide:=true,\ org.slf4j;provide:=true;-split-package:=merge-last;version=1.7.0 - Private-Package: \ osgi.enroute.logger.simple.provider,\ org.slf4j.impl;-split-package:=first,\ org.slf4j.helpers,\ org.slf4j.spi - -Conditional-Package: aQute.lib* +Bundle-License: http://opensource.org/licenses/BSD-2-Clause +Conditional-Package: aQute.lib* -buildpath: \ osgi.enroute.base.api;version=1.0;packages=*,\ - biz.aQute.junit,\ biz.aQute.bndlib;packages=* --includeresource: {readme.md} +-testpath: \ + osgi.enroute.junit.wrapper + +-includeresource: \ + {readme.md}, \ + LICENSE.txt -runrequires: \ diff --git a/osgi.enroute.rest.simple.provider/bnd.bnd b/osgi.enroute.rest.simple.provider/bnd.bnd index 05391ec..9af0160 100644 --- a/osgi.enroute.rest.simple.provider/bnd.bnd +++ b/osgi.enroute.rest.simple.provider/bnd.bnd @@ -12,22 +12,22 @@ Bundle-Description: \ the method (get, delete, option, etc). The second part is the name of the endpoint. The remaining path is mapped to the arguments of the method. The \ returned object is returned as JSON. - Export-Package: \ osgi.enroute.rest.api; provide:=true - Private-Package: \ osgi.enroute.rest.simple.provider - + Conditional-Package: aQute.lib* -buildpath: \ osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit,\ biz.aQute.bndlib;packages=* --includeresource: {readme.md} +-testpath: \ + osgi.enroute.junit.wrapper + +-includeresource: {readme.md}, LICENSE.txt=${build}/licenses/ASL-2.0.txt -runrequires: \ diff --git a/osgi.enroute.scheduler.simple.provider/bnd.bnd b/osgi.enroute.scheduler.simple.provider/bnd.bnd index 51030cc..91227a6 100644 --- a/osgi.enroute.scheduler.simple.provider/bnd.bnd +++ b/osgi.enroute.scheduler.simple.provider/bnd.bnd @@ -5,11 +5,9 @@ Bundle-Version: 1.1.1.${tstamp} Bundle-Description: \ - This bundle implements a scheduler and some Promise support methods related to time. - + This bundle implements a scheduler and some Promise support methods related to time. Private-Package: \ osgi.enroute.scheduler.simple.provider - Export-Package: \ osgi.enroute.scheduler.api;provide:=true @@ -17,10 +15,12 @@ Conditional-Package: aQute.lib* -buildpath: \ osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit,\ biz.aQute.bndlib;packages=* --includeresource: {readme.md} +-testpath: \ + osgi.enroute.junit.wrapper + +-includeresource: {readme.md}, LICENSE.txt=${build}/licenses/ASL-2.0.txt -runrequires: \ diff --git a/osgi.enroute.stackexchange.pagedown.webresource/bnd.bnd b/osgi.enroute.stackexchange.pagedown.webresource/bnd.bnd index f88a463..c307699 100644 --- a/osgi.enroute.stackexchange.pagedown.webresource/bnd.bnd +++ b/osgi.enroute.stackexchange.pagedown.webresource/bnd.bnd @@ -27,8 +27,15 @@ Bundle-Description: \ Stack Exchange blog (http://blog.stackoverflow.com/2008/12/reverse-engineering-the-wmd-editor/) for some historical information. Bundle-DocURL: https://code.google.com/p/pagedown/wiki/PageDown -Bundle-License: http://opensource.org/licenses/MIT";link = "http://en.wikipedia.org/wiki/MIT_License";description = "MIT License" -Export-Package: osgi.enroute.stackexchange.pagedown.webresource +Bundle-License: http://opensource.org/licenses/MIT";link=https://github.com/ujifgc/pagedown/blob/master/LICENSE.txt +Bundle-Copyright: \ + Original Markdown Copyright (c) 2004-2005 John Gruber \ + . \ + Original Showdown code copyright (c) 2007 John Fraser. \ + Modifications and bugfixes (c) 2009 Dana Robinson and \ + (c) 2009-2014 Stack Exchange Inc. + +Export-Package: osgi.enroute.stackexchange.pagedown.capabilities;-split-package:=first Provide-Capability: \ osgi.enroute.webresource; \ osgi.enroute.webresource=${name}; \ diff --git a/osgi.enroute.twitter.bootstrap.webresource/LICENSE.txt b/osgi.enroute.twitter.bootstrap.webresource/LICENSE.txt new file mode 100644 index 0000000..9858866 --- /dev/null +++ b/osgi.enroute.twitter.bootstrap.webresource/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2011-2015 Twitter, Inc + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/osgi.enroute.twitter.bootstrap.webresource/bnd.bnd b/osgi.enroute.twitter.bootstrap.webresource/bnd.bnd index 03c9647..055aa92 100644 --- a/osgi.enroute.twitter.bootstrap.webresource/bnd.bnd +++ b/osgi.enroute.twitter.bootstrap.webresource/bnd.bnd @@ -12,12 +12,12 @@ Bundle-Description: \ Bootstrap: Sleek, intuitive, and powerful front-end framework for faster and \ easier web development. -Bundle-License: http://opensource.org/licenses/Apache-2.0 Bundle-Vendor: Twitter (bundled by OSGi enRoute) Bundle-DocURL: https://github.com/twbs/bootstrap/releases/download/v${vrs}/bootstrap-{vrs}-dist.zip Bundle-Icon: http://flipstorm.co.uk/bwb/img/logo-med.png -Export-Package: osgi.enroute.twitter.bootstrap.capabilities - +Export-Package: osgi.enroute.twitter.bootstrap.capabilities;-split-package:=first +Bundle-License http://opensource.org/licenses/mit-license.php +Bundle-Copyright: Copyright (c) 2011-2015 Twitter, Inc Provide-Capability: \ osgi.enroute.webresource; \ osgi.enroute.webresource=${name}; \ @@ -27,7 +27,8 @@ Provide-Capability: \ -buildpath: \ osgi.enroute.base.api --includeresource: ${path}=${vrs}, {readme.md} +-includeresource: ${path}=${vrs}, {readme.md}, LICENSE.txt + -runrequires: \ osgi.identity;filter:='(osgi.identity=osgi.enroute.twitter.bootstrap.webresource)' -runbundles: \ diff --git a/osgi.enroute.twitter.bootstrap.webresource/src/osgi/enroute/twitter/bootstrap/capabilities/package-info.java b/osgi.enroute.twitter.bootstrap.webresource/src/osgi/enroute/twitter/bootstrap/capabilities/package-info.java new file mode 100644 index 0000000..0740843 --- /dev/null +++ b/osgi.enroute.twitter.bootstrap.webresource/src/osgi/enroute/twitter/bootstrap/capabilities/package-info.java @@ -0,0 +1,2 @@ +@org.osgi.annotation.versioning.Version(osgi.enroute.twitter.bootstrap.capabilities.BootstrapConstants.BOOTSTRAP_WEB_RESOURCE_VERSION) +package osgi.enroute.twitter.bootstrap.capabilities; \ No newline at end of file diff --git a/osgi.enroute.web.simple.provider/bnd.bnd b/osgi.enroute.web.simple.provider/bnd.bnd index 7ca6b55..c9ad9d1 100644 --- a/osgi.enroute.web.simple.provider/bnd.bnd +++ b/osgi.enroute.web.simple.provider/bnd.bnd @@ -7,21 +7,23 @@ Bundle-Version: 1.3.3.${tstamp} Bundle-Description: \ Provides a simple implementation of the OSGi enRoute webserver with a number \ of useful filters. - - +Export-Package: \ + aQute.service.reporter, \ + osgi.enroute.webserver.capabilities + Private-Package: \ osgi.enroute.web.server.provider -Export-Package: \ - aQute.service.reporter,\ - osgi.enroute.web.extender + Conditional-Package: aQute.lib* -buildpath: \ osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit,\ biz.aQute.bndlib;packages=* --includeresource: {readme.md}, static=static +-testpath: \ + osgi.enroute.junit.wrapper + +-includeresource: {readme.md}, static=static, LICENSE.txt=${build}/licenses/ASL-2.0.txt -runbundles: \ diff --git a/osgi.enroute.websecurity.adapter/bnd.bnd b/osgi.enroute.websecurity.adapter/bnd.bnd index 92d0547..ccd833b 100644 --- a/osgi.enroute.websecurity.adapter/bnd.bnd +++ b/osgi.enroute.websecurity.adapter/bnd.bnd @@ -7,8 +7,6 @@ Bundle-Version: 1.1.2.${tstamp} Bundle-Description: \ Provides a filter that will start a Coordinator -Export-Package: \ - osgi.enroute.websecurity.adapter.api;provide:=true Private-Package: \ osgi.enroute.websecurity.adapter @@ -18,10 +16,12 @@ Conditional-Package: aQute.lib* -buildpath: \ osgi.enroute.base.api;version=1.0,\ - biz.aQute.junit,\ biz.aQute.bndlib;packages=* --includeresource: {readme.md} +-testpath: \ + osgi.enroute.junit.wrapper + +-includeresource: {readme.md}, LICENSE.txt=${build}/licenses/ASL-2.0.txt -runrequires: \