Skip to content

Commit

Permalink
cleanups & adjustments for Bndtools 1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Rafał Krzewski committed Jun 5, 2012
1 parent e9faa58 commit 334d6e9
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 58 deletions.
9 changes: 1 addition & 8 deletions bndtools/pl.caltha.osgi.bndtools.impl/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
-runbundles: osgi.cmpn,\
org.apache.felix.scr,\
org.apache.felix.shell,\
org.apache.felix.shell.tui
-runfw: org.apache.felix.framework
-buildpath: osgi.core,\
osgi.cmpn,\
biz.aQute.bnd.annotation,\
-buildpath: biz.aQute.bnd.annotation,\
junit.osgi,\
pl.caltha.osgi.bndtools.api;version=latest,\
org.apache.felix.shell
Expand Down
19 changes: 9 additions & 10 deletions bndtools/pl.caltha.osgi.bndtools.impl/run.bndrun
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
-runfw: org.apache.felix.framework;version='[4,5)'

-runbundles: org.apache.felix.shell;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.shell/org.apache.felix.shell-1.4.2.jar;version='[1.4.2,1.4.3)',\
org.apache.felix.shell.tui;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.shell.tui/org.apache.felix.shell.tui-1.4.1.jar;version='[1.4.1,1.4.2)',\
pl.caltha.osgi.bndtools.impl.provider;resolution=file:/home/rafal/workspaces/osgi-bndtools/pl.caltha.osgi.bndtools.impl/generated/pl.caltha.osgi.bndtools.impl.provider.jar;version=latest,\
pl.caltha.osgi.bndtools.impl.command;resolution=file:/home/rafal/workspaces/osgi-bndtools/pl.caltha.osgi.bndtools.impl/generated/pl.caltha.osgi.bndtools.impl.command.jar;version=latest,\
org.apache.felix.scr;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.scr/org.apache.felix.scr-1.6.0.jar;version='[1.6.0,1.6.1)',\
pl.caltha.osgi.bndtools.api;resolution=file:/home/rafal/workspaces/osgi-bndtools/pl.caltha.osgi.bndtools.api/generated/pl.caltha.osgi.bndtools.api.jar;version=latest,\
osgi.cmpn;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/osgi.cmpn/osgi.cmpn-4.2.0.jar;version='[4.2.0,4.2.1)'

-runbundles: pl.caltha.osgi.bndtools.api;version=latest,\
org.apache.felix.scr;version='[1.6.0,1.6.1)',\
org.apache.felix.shell.tui;version='[1.4.1,1.4.2)',\
pl.caltha.osgi.bndtools.impl.provider;version=latest,\
pl.caltha.osgi.bndtools.impl.command;version=latest,\
org.apache.felix.shell;version='[1.4.2,1.4.3)',\
org.apache.felix.configadmin;version='[1.2.8,1.2.9)'
-runrequire: bundle:(symbolicname=org.apache.felix.shell),\
bundle:(symbolicname=org.apache.felix.shell.tui),\
bundle:(symbolicname=pl.caltha.osgi.bndtools.impl.provider),\
bundle:(symbolicname=org.apache.felix.scr),\
bundle:(symbolicname=pl.caltha.osgi.bndtools.impl.command)
bundle:(symbolicname=pl.caltha.osgi.bndtools.impl.command),\
bundle:(symbolicname=org.apache.felix.configadmin)
-resolve: auto
27 changes: 1 addition & 26 deletions bndtools/pl.caltha.osgi.bndtools.web/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,30 +1,5 @@
-runbundles: org.apache.felix.shell;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.shell/org.apache.felix.shell-1.4.2.jar;version='[1.4.2,1.4.3)',\
org.apache.felix.shell.tui;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.shell.tui/org.apache.felix.shell.tui-1.4.1.jar;version='[1.4.1,1.4.2)',\
pl.caltha.osgi.bndtools.impl.provider;resolution=file:/home/rafal/workspaces/osgi-bndtools/pl.caltha.osgi.bndtools.impl/generated/pl.caltha.osgi.bndtools.impl.provider.jar;version=latest,\
org.apache.felix.fileinstall;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.fileinstall/org.apache.felix.fileinstall-3.1.10.jar;version='[3.1.10,3.1.11)',\
org.apache.felix.http.whiteboard;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.http.whiteboard/org.apache.felix.http.whiteboard-2.2.0.jar;version='[2.2.0,2.2.1)',\
org.apache.felix.scr;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.scr/org.apache.felix.scr-1.6.0.jar;version='[1.6.0,1.6.1)',\
pl.caltha.osgi.bndtools.api;resolution=file:/home/rafal/workspaces/osgi-bndtools/pl.caltha.osgi.bndtools.api/generated/pl.caltha.osgi.bndtools.api.jar;version=latest,\
org.apache.felix.http.jetty;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.0.jar;version='[2.2.0,2.2.1)',\
org.apache.felix.configadmin;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.2.8.jar;version='[1.2.8,1.2.9)',\
osgi.cmpn;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/osgi.cmpn/osgi.cmpn-4.2.0.jar;version='[4.2.0,4.2.1)'
Service-Component: pl.caltha.osgi.bndtools.web.TestServlet
-runfw: org.apache.felix.framework
-buildpath: osgi.core,\
osgi.cmpn,\
biz.aQute.bnd.annotation,\
junit.osgi,\
-buildpath: biz.aQute.bnd.annotation,\
org.apache.felix.http.jetty,\
org.apache.felix.http.whiteboard,\
pl.caltha.osgi.bndtools.api;version=latest
Private-Package: pl.caltha.osgi.bndtools.web
-runrequire: bundle:(symbolicname=org.apache.felix.fileinstall),\
bundle:(symbolicname=org.apache.felix.configadmin),\
bundle:(symbolicname=org.apache.felix.http.jetty),\
bundle:(symbolicname=org.apache.felix.http.whiteboard),\
bundle:(symbolicname=org.apache.felix.scr),\
bundle:(symbolicname=pl.caltha.osgi.bndtools.impl.provider),\
bundle:(&(symbolicname=org.apache.felix.shell)(version>=1.4.2)),\
bundle:(symbolicname=org.apache.felix.shell.tui)
-resolve: auto
-runproperties: felix.fileinstall.disableConfigSave=false
25 changes: 11 additions & 14 deletions bndtools/pl.caltha.osgi.bndtools.web/run.bndrun
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
-runfw: org.apache.felix.framework;version='[4,5)'

-runbundles: org.apache.felix.shell;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.shell/org.apache.felix.shell-1.4.2.jar;version='[1.4.2,1.4.3)',\
org.apache.felix.shell.tui;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.shell.tui/org.apache.felix.shell.tui-1.4.1.jar;version='[1.4.1,1.4.2)',\
pl.caltha.osgi.bndtools.impl.provider;resolution=file:/home/rafal/workspaces/osgi-bndtools/pl.caltha.osgi.bndtools.impl/generated/pl.caltha.osgi.bndtools.impl.provider.jar;version=latest,\
org.apache.felix.http.whiteboard;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.http.whiteboard/org.apache.felix.http.whiteboard-2.2.0.jar;version='[2.2.0,2.2.1)',\
org.apache.felix.fileinstall;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.fileinstall/org.apache.felix.fileinstall-3.1.10.jar;version='[3.1.10,3.1.11)',\
org.apache.felix.log;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.log/org.apache.felix.log-1.0.1.jar;version='[1.0.1,1.0.2)',\
org.apache.felix.configadmin;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.2.8.jar;version='[1.2.8,1.2.9)',\
osgi.cmpn;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/osgi.cmpn/osgi.cmpn-4.2.0.jar;version='[4.2.0,4.2.1)',\
pl.caltha.osgi.bndtools.web;resolution=file:/home/rafal/workspaces/osgi-bndtools/pl.caltha.osgi.bndtools.web/generated/pl.caltha.osgi.bndtools.web.jar;version=latest,\
org.apache.felix.scr;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.scr/org.apache.felix.scr-1.6.0.jar;version='[1.6.0,1.6.1)',\
org.apache.felix.http.jetty;resolution=file:/home/rafal/workspaces/osgi-bndtools/cnf/repo/org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.0.jar;version='[2.2.0,2.2.1)',\
pl.caltha.osgi.bndtools.api;resolution=file:/home/rafal/workspaces/osgi-bndtools/pl.caltha.osgi.bndtools.api/generated/pl.caltha.osgi.bndtools.api.jar;version=latest

-runbundles: org.apache.felix.http.jetty;version='[2.2.0,2.2.1)',\
pl.caltha.osgi.bndtools.impl.provider;version=latest,\
org.apache.felix.shell;version='[1.4.2,1.4.3)',\
org.apache.felix.configadmin;version='[1.2.8,1.2.9)',\
org.apache.felix.fileinstall;version='[3.1.4,3.1.5)',\
pl.caltha.osgi.bndtools.api;version=latest,\
org.apache.felix.scr;version='[1.6.0,1.6.1)',\
pl.caltha.osgi.bndtools.web;version=latest,\
org.apache.felix.http.whiteboard;version='[2.2.0,2.2.1)',\
org.apache.felix.shell.tui;version='[1.4.1,1.4.2)',\
org.apache.felix.log;version='[1.0.1,1.0.2)'
-runrequire: bundle:(symbolicname=org.apache.felix.shell),\
bundle:(symbolicname=org.apache.felix.shell.tui),\
bundle:(symbolicname=pl.caltha.osgi.bndtools.web),\
Expand Down

0 comments on commit 334d6e9

Please sign in to comment.