ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1362476 - in /ace/sandbox/marrs: org.apache.ace.ant.tasks/ org.apache.ace.authentication.itest/ org.apache.ace.authenticationprocessor.basicauth/ org.apache.ace.authenticationprocessor.clientcert/ org.apache.ace.authenticationprocessor.pas...
Date Tue, 17 Jul 2012 12:55:20 GMT
Author: jawi
Date: Tue Jul 17 12:55:19 2012
New Revision: 1362476

URL: http://svn.apache.org/viewvc?rev=1362476&view=rev
Log:
- Upgraded the Knopflerfish UserAdmin & Log bundles to the ones provided by Apache Felix;
- Removed obsolete(?) FileInstall bundle from the server.run script.


Modified:
    ace/sandbox/marrs/org.apache.ace.ant.tasks/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.authenticationprocessor.basicauth/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.authenticationprocessor.clientcert/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.authenticationprocessor.password/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.client.repository.helper.base/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.client.repository.impl/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.client.repository.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.client.rest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.configurator/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.connectionfactory/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.deployment.streamgenerator/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.obr.metadata/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.processlauncher/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd
    ace/sandbox/marrs/run-server/server.bndrun
    ace/sandbox/marrs/run-target/target.bndrun

Modified: ace/sandbox/marrs/org.apache.ace.ant.tasks/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.ant.tasks/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.ant.tasks/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.ant.tasks/bnd.bnd Tue Jul 17 12:55:19 2012
@@ -1,3 +1,3 @@
--buildpath: ../cnf/lib/ant.jar;version=file,\
+-buildpath: ant;version=latest,\
 	org.apache.ace.builder;version=latest
 Export-Package: org.apache.ace.ant.deploymentpackage
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd Tue Jul 17 12:55:19 2012
@@ -19,8 +19,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 -runfw: org.apache.felix.framework;version='[4,5)'
 -runbundles: \
 	osgi.cmpn;version='[4.2.1,4.2.2)',\
-	org.knopflerfish.bundle.useradmin;version='[2.0.2,2.0.3)',\
-	org.knopflerfish.log;version='[2.0.2,2.0.3)',\
+	org.apache.felix.useradmin;version='[0.9.9,1.0.0)',\
+	org.apache.felix.log;version='[1.0.1,1.0.2)',\
 	org.apache.felix.dependencymanager;version='[3.1.0,3.1.1)',\
 	org.apache.felix.dependencymanager.shell;version='[3.0.1,3.0.2)',\
 	org.apache.felix.configadmin;version='[1.2.8,1.2.9)',\

Modified: ace/sandbox/marrs/org.apache.ace.authenticationprocessor.basicauth/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.authenticationprocessor.basicauth/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.authenticationprocessor.basicauth/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.authenticationprocessor.basicauth/bnd.bnd Tue Jul 17
12:55:19 2012
@@ -3,7 +3,7 @@
 	javax.servlet,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.authentication.api;version=latest,\
-	../cnf/lib/commons-codec-1.4.jar;version=file,\
+	commons-codec;version=1.4,\
 	org.apache.ace.test;version=latest,\
 	org.mockito.mockito-all
 Private-Package: org.apache.ace.authenticationprocessor.basicauth,\

Modified: ace/sandbox/marrs/org.apache.ace.authenticationprocessor.clientcert/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.authenticationprocessor.clientcert/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.authenticationprocessor.clientcert/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.authenticationprocessor.clientcert/bnd.bnd Tue Jul 17
12:55:19 2012
@@ -3,7 +3,7 @@
 	javax.servlet,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.authentication.api;version=latest,\
-	../cnf/lib/bcprov-jdk14-140.jar;version=file,\
+	bcprov-jdk14;version=latest,\
 	org.apache.ace.test;version=latest,\
 	org.mockito.mockito-all
 Private-Package: org.apache.ace.authenticationprocessor.clientcert

Modified: ace/sandbox/marrs/org.apache.ace.authenticationprocessor.password/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.authenticationprocessor.password/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.authenticationprocessor.password/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.authenticationprocessor.password/bnd.bnd Tue Jul 17 12:55:19
2012
@@ -2,7 +2,7 @@
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.authentication.api;version=latest,\
-	../cnf/lib/commons-codec-1.4.jar;version=file,\
+	commons-codec;version=1.4,\
 	org.apache.ace.test;version=latest,\
 	org.mockito.mockito-all
 Private-Package: org.apache.ace.authenticationprocessor.password,\

Modified: ace/sandbox/marrs/org.apache.ace.client.repository.helper.base/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.repository.helper.base/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.repository.helper.base/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.client.repository.helper.base/bnd.bnd Tue Jul 17 12:55:19
2012
@@ -5,10 +5,10 @@
 	org.apache.ace.log;version=latest,\
 	org.apache.ace.test;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
-	../cnf/lib/commons-lang-2.4.jar;version=file,\
-	../cnf/lib/commons-collections-3.2.1.jar;version=file,\
-	../cnf/lib/velocity-1.6.2.jar;version=file,\
-	../cnf/lib/xpp3-1.1.4c.jar;version=file
+	commons-lang;version=2.4.0,\
+	commons-collections;version=3.2.1,\
+	velocity;version=1.6.2,\
+	xpp3;version=1.1.4
 Private-Package: org.apache.commons.lang,\
 	javax.xml.namespace,\
 	org.xmlpull.mxp1,\

Modified: ace/sandbox/marrs/org.apache.ace.client.repository.impl/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.repository.impl/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.repository.impl/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.client.repository.impl/bnd.bnd Tue Jul 17 12:55:19 2012
@@ -7,8 +7,8 @@
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.test;version=latest,\
-	../cnf/lib/xpp3-1.1.4c.jar;version=file,\
-	../cnf/lib/xstream-1.2.2.jar;version=file,\
+	xpp3;version=1.1.4,\
+	xstream;version=1.2.2,\
 	org.apache.ace.repository.ext;version=latest,\
 	org.apache.ace.server.log.store;version=latest,\
 	org.apache.ace.client.repository.helper.bundle;version=latest,\

Modified: ace/sandbox/marrs/org.apache.ace.client.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.repository.itest/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.repository.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.client.repository.itest/bnd.bnd Tue Jul 17 12:55:19 2012
@@ -49,8 +49,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.deployment.streamgenerator;version=latest,\
 	org.apache.ace.deployment.provider.base;version=latest,\
 	org.apache.felix.prefs,\
-	org.knopflerfish.bundle.useradmin,\
-	org.knopflerfish.log,\
+	org.apache.felix.useradmin;version='[0.9.9,1.0.0)',\
+	org.apache.felix.log;version='[1.0.1,1.0.2)',\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.log;version=latest,\
 	org.apache.ace.server.log.store;version=latest,\

Modified: ace/sandbox/marrs/org.apache.ace.client.rest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.rest/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.rest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.client.rest/bnd.bnd Tue Jul 17 12:55:19 2012
@@ -9,9 +9,8 @@
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.test;version=latest,\
 	javax.servlet,\
-	../cnf/lib/gson-1.7.1.jar;version=file,\
+	gson;version=1.7.1,\
 	org.mockito.mockito-all
-
 Private-Package: org.apache.ace.client.rest,\
 	com.google.gson,\
 	com.google.gson.annotations,\

Modified: ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.configurator.useradmin.itest/bnd.bnd Tue Jul 17 12:55:19
2012
@@ -20,8 +20,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.felix.http.jetty;version='[2.2.0,2.2.1)',\
 	org.apache.felix.prefs;version='[1.0.4,1.0.5)',\
 	osgi.cmpn;version='[4.2.1,4.2.2)',\
-	org.knopflerfish.bundle.useradmin;version='[2.0.2,2.0.3)',\
-	org.knopflerfish.log;version='[2.0.2,2.0.3)',\
+	org.apache.felix.useradmin;version='[0.9.9,1.0.0)',\
+	org.apache.felix.log;version='[1.0.1,1.0.2)',\
     org.apache.ace.test;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\

Modified: ace/sandbox/marrs/org.apache.ace.configurator/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.configurator/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.configurator/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.configurator/bnd.bnd Tue Jul 17 12:55:19 2012
@@ -2,6 +2,6 @@
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.test;version=latest,\
-	../cnf/lib/commons-io-2.0.1.jar;version=file
+	commons-io;version=2.0.1
 Bundle-Activator: org.apache.ace.configurator.Activator
 Private-Package: org.apache.ace.configurator
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.connectionfactory/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.connectionfactory/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.connectionfactory/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.connectionfactory/bnd.bnd Tue Jul 17 12:55:19 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.ace.test;version=latest,\
-	../cnf/lib/commons-codec-1.4.jar;version=file
+	commons-codec;version=1.4
 Private-Package: org.apache.ace.connectionfactory.impl,\
 	org.apache.commons.codec,\
 	org.apache.commons.codec.binary

Modified: ace/sandbox/marrs/org.apache.ace.deployment.streamgenerator/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.deployment.streamgenerator/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.deployment.streamgenerator/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.deployment.streamgenerator/bnd.bnd Tue Jul 17 12:55:19
2012
@@ -5,9 +5,8 @@
 	org.apache.ace.test;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.ops4j.pax.swissbox.tinybundles,\
-	../cnf/lib/commons-logging-1.1.1.jar;version=file,\
+	commons-logging;version=1.1.1,\
 	org.ops4j.base.store
-	
 Private-Package: org.apache.ace.deployment.streamgenerator.impl
 Bundle-Activator: org.apache.ace.deployment.streamgenerator.impl.Activator
 Export-Package: org.apache.ace.deployment.streamgenerator
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/bnd.bnd Tue Jul 17 12:55:19 2012
@@ -4,32 +4,32 @@
 	org.apache.ace.nodelauncher.api;version=latest,\
 	org.apache.ace.test;version=latest,\
 	com.google.inject,\
-	com.google.gson,\
+	com.google.gson;version=2.2.0,\
 	com.google.inject.assistedinject,\
-	aws-ec2,\
-	jclouds-sshj,\
-	jclouds-compute,\
-	jclouds-core,\
+	aws-ec2;version=1.5.0.beta_6,\
+	jclouds-sshj;version=1.5.0.beta_6,\
+	jclouds-compute;version=1.5.0.beta_6,\
+	jclouds-core;version=1.5.0.beta_6,\
 	slf4j.api,\
 	slf4j.simple,\
-	aws-common,\
-	jclouds-scriptbuilder,\
-	ec2,\
+	aws-common;version=1.5.0.beta_6,\
+	jclouds-scriptbuilder;version=1.5.0.beta_6,\
+	ec2;version=1.5.0.beta_6,\
 	bcprov,\
-	jclouds-bouncycastle,\
-	jclouds-slf4j,\
+	jclouds-bouncycastle;version=1.5.0.beta_6,\
+	jclouds-slf4j;version=1.5.0.beta_6,\
 	com.sun.jersey.jersey-core,\
-	rocoto,\
+	rocoto;version=6.1.0,\
 	net.schmizz.sshj,\
 	com.jcraft.jsch,\
-	../cnf/lib/aopalliance-1.0.jar;version=file,\
-	../cnf/lib/commons-io-2.0.1.jar;version=file,\
-	../cnf/lib/guava-11.0.2.jar;version=file,\
-	../cnf/lib/javax.inject-1.jar;version=file,\
-	../cnf/lib/jsch-0.1.44-1.jar;version=file,\
-	../cnf/lib/jsr250-api-1.0.jar;version=file,\
-	../cnf/lib/jsr305-1.3.9.jar;version=file,\
-	../cnf/lib/oauth-20100527.jar;version=file
+	aopalliance;version=1.0.0,\
+	commons-io;version=2.0.1,\
+	com.google.guava;version=12.0.0,\
+	javax.inject;version=1.0.0,\
+	jsch;version=0.1.44.1,\
+	jsr250-api;version=1.0.0,\
+	jsr305;version=1.3.9,\
+	oauth;version=20100527.0.0
 Private-Package: org.jclouds.*,\
 	com.google.*,\
 	net.schmizz.*,\

Modified: ace/sandbox/marrs/org.apache.ace.obr.metadata/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.obr.metadata/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.obr.metadata/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.obr.metadata/bnd.bnd Tue Jul 17 12:55:19 2012
@@ -4,7 +4,7 @@
 	org.apache.ace.test;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.deployment.provider.base;version=latest,\
-	../cnf/lib/kxml2-2.3.0.jar;version=file
+	kxml2;version=2.3.0
 Private-Package: org.apache.ace.obr.metadata.bindex,\
 	org.kxml2.io,\
 	org.kxml2.kdom,\

Modified: ace/sandbox/marrs/org.apache.ace.processlauncher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.processlauncher/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.processlauncher/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.processlauncher/bnd.bnd Tue Jul 17 12:55:19 2012
@@ -4,18 +4,17 @@
 	osgi.core,\
 	osgi.cmpn,\
 	slf4j.simple,\
-	../cnf/lib/junit-4.8.2.jar;version=file,\
-	../cnf/lib/javax.inject-1.jar;version=file,\
-	../cnf/lib/pax-exam-2.3.0.jar;version=file,\
-	../cnf/lib/pax-exam-container-native-2.3.0.jar;version=file,\
-	../cnf/lib/pax-exam-inject-2.3.0.jar;version=file,\
-	../cnf/lib/pax-exam-junit4-2.3.0.jar;version=file,\
-	../cnf/lib/pax-exam-link-mvn-2.3.0.jar;version=file,\
-	../cnf/lib/pax-url-aether-1.3.5.jar;version=file,\
-	../cnf/lib/pax-url-assembly-1.3.5.jar;version=file,\
-	../cnf/lib/pax-url-link-1.3.5.jar;version=file,\
-	../cnf/lib/pax-url-wrap-1.3.5.jar;version=file
-	
+	junit;version=4.8.2,\
+	javax.inject;version=1.0.0,\
+	pax-exam;version=2.3.0,\
+	pax-exam-container-native;version=2.3.0,\
+	pax-exam-inject;version=2.3.0,\
+	pax-exam-junit4;version=2.3.0,\
+	pax-exam-link-mvn;version=2.3.0,\
+	pax-url-aether;version=1.3.5,\
+	pax-url-assembly;version=1.3.5,\
+	pax-url-link;version=1.3.5,\
+	pax-url-wrap;version=1.3.5
 Private-Package: org.apache.ace.processlauncher.osgi,\
 	org.apache.ace.processlauncher.impl
 Bundle-Activator: org.apache.ace.processlauncher.osgi.Activator

Modified: ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd Tue Jul 17 12:55:19 2012
@@ -12,7 +12,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 -runfw: org.apache.felix.framework;version='[4,5)'
 -runbundles: \
 	osgi.cmpn;version='[4.2.1,4.2.2)',\
-	org.knopflerfish.log;version='[2.0.2,2.0.3)',\
+	org.apache.felix.log;version='[1.0.1,1.0.2)',\
 	org.apache.felix.dependencymanager;version='[3.1.0,3.1.1)',\
 	org.apache.felix.configadmin;version='[1.2.8,1.2.9)',\
 	org.apache.felix.prefs;version='[1.0.4,1.0.5)',\

Modified: ace/sandbox/marrs/run-server/server.bndrun
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/run-server/server.bndrun?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/run-server/server.bndrun (original)
+++ ace/sandbox/marrs/run-server/server.bndrun Tue Jul 17 12:55:19 2012
@@ -1,62 +1,61 @@
 -runfw: org.apache.felix.framework;version='[4.0.2,4.0.2]'
 -runee: JavaSE-1.6
--runbundles: org.apache.felix.dependencymanager;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar;version='[3.1.0,3.1.1)',\
-	org.knopflerfish.bundle.useradmin;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.knopflerfish.bundle.useradmin/org.knopflerfish.bundle.useradmin-2.0.2.jar;version='[2.0.2,2.0.3)',\
-	org.apache.ace.configurator.useradmin.task;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.configurator.useradmin.task/generated/org.apache.ace.configurator.useradmin.task.jar;version=latest,\
-	org.apache.ace.http.redirector;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.http.redirector/generated/org.apache.ace.http.redirector.jar;version=latest,\
-	org.apache.felix.prefs;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.prefs/org.apache.felix.prefs-1.0.4.jar;version='[1.0.4,1.0.5)',\
-	org.apache.ace.target.mgmt.ui;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.target.mgmt.ui/generated/org.apache.ace.target.mgmt.ui.jar;version=latest,\
-	org.apache.ace.log.servlet;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.log.servlet/generated/org.apache.ace.log.servlet.jar;version=latest,\
-	org.apache.ace.deployment.streamgenerator;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.deployment.streamgenerator/generated/org.apache.ace.deployment.streamgenerator.jar;version=latest,\
-	org.apache.felix.fileinstall;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.fileinstall/org.apache.felix.fileinstall-3.1.4.jar;version='[3.1.4,3.1.5)',\
-	org.apache.ace.authentication.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.authentication.api/generated/org.apache.ace.authentication.api.jar;version=latest,\
-	org.apache.felix.gogo.shell;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar;version='[0.10.0,0.10.1)',\
-	org.knopflerfish.log;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.knopflerfish.log/org.knopflerfish.log-2.0.2.jar;version='[2.0.2,2.0.3)',\
-	org.apache.ace.client.repository.impl;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.client.repository.impl/generated/org.apache.ace.client.repository.impl.jar;version=latest,\
-	org.apache.felix.http.jetty;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.0.jar;version='[2.2.0,2.2.1)',\
-	org.apache.felix.dependencymanager.shell;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-3.0.1.jar;version='[3.0.1,3.0.2)',\
-	org.apache.ace.tageditor;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.tageditor/generated/org.apache.ace.tageditor.jar;version=latest,\
-	org.apache.ace.client.repository.helper.bundle;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.client.repository.helper.bundle/generated/org.apache.ace.client.repository.helper.bundle.jar;version=latest,\
-	org.apache.ace.discovery.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.discovery.api/generated/org.apache.ace.discovery.api.jar;version=latest,\
-	org.apache.ace.client.rest;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.client.rest/generated/org.apache.ace.client.rest.jar;version=latest,\
-	org.apache.ace.range.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.range.api/generated/org.apache.ace.range.api.jar;version=latest,\
-	org.apache.ace.log;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.log/generated/org.apache.ace.log.jar;version=latest,\
-	org.apache.ace.authenticationprocessor.password;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.authenticationprocessor.password/generated/org.apache.ace.authenticationprocessor.password.jar;version=latest,\
-	com.vaadin;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/com.vaadin/com.vaadin-6.5.1.jar;version='[6.5.1,6.5.2)',\
-	org.apache.felix.gogo.command;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.command/org.apache.felix.gogo.command-0.12.0.jar;version='[0.12.0,0.12.1)',\
-	org.apache.ace.webui.vaadin;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.webui.vaadin/generated/org.apache.ace.webui.vaadin.jar;version=latest,\
-	org.apache.ace.resourceprocessor.useradmin;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.resourceprocessor.useradmin/generated/org.apache.ace.resourceprocessor.useradmin.jar;version=latest,\
-	org.apache.ace.server.log.ui;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.server.log.ui/generated/org.apache.ace.server.log.ui.jar;version=latest,\
-	org.apache.ace.deployment.verifier.ui;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.deployment.verifier.ui/generated/org.apache.ace.deployment.verifier.ui.jar;version=latest,\
-	org.apache.ace.repository.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.repository.api/generated/org.apache.ace.repository.api.jar;version=latest,\
-	org.apache.ace.server.log.store;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.server.log.store/generated/org.apache.ace.server.log.store.jar;version=latest,\
-	org.apache.ace.client.repository.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.client.repository.api/generated/org.apache.ace.client.repository.api.jar;version=latest,\
-	org.apache.ace.repository.servlet;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.repository.servlet/generated/org.apache.ace.repository.servlet.jar;version=latest,\
-	org.apache.ace.obr.storage;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.obr.storage/generated/org.apache.ace.obr.storage.jar;version=latest,\
-	org.apache.ace.client.repository.helper.configuration;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.client.repository.helper.configuration/generated/org.apache.ace.client.repository.helper.configuration.jar;version=latest,\
-	org.apache.ace.consolelogger;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.consolelogger/generated/org.apache.ace.consolelogger.jar;version=latest,\
-	org.apache.felix.configadmin;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.configadmin/org.apache.felix.configadmin-1.2.8.jar;version='[1.2.8,1.2.9)',\
-	org.apache.ace.httplistener;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.httplistener/generated/org.apache.ace.httplistener.jar;version=latest,\
-	org.apache.ace.obr.servlet;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.obr.servlet/generated/org.apache.ace.obr.servlet.jar;version=latest,\
-	org.apache.ace.nodelauncher.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.nodelauncher.api/generated/org.apache.ace.nodelauncher.api.jar;version=latest,\
-	org.apache.ace.deployment.provider.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.deployment.provider.api/generated/org.apache.ace.deployment.provider.api.jar;version=latest,\
-	org.apache.felix.gogo.runtime;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-0.10.0.jar;version='[0.10.0,0.10.1)',\
-	org.apache.ace.deployment.servlet;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.deployment.servlet/generated/org.apache.ace.deployment.servlet.jar;version=latest,\
-	org.apache.ace.scheduler;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.scheduler/generated/org.apache.ace.scheduler.jar;version=latest,\
-	org.apache.ace.obr.metadata;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.obr.metadata/generated/org.apache.ace.obr.metadata.jar;version=latest,\
-	org.apache.ace.configurator;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.configurator/generated/org.apache.ace.configurator.jar;version=latest,\
-	org.apache.ace.connectionfactory;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.connectionfactory/generated/org.apache.ace.connectionfactory.jar;version=latest,\
-	org.apache.ace.authentication;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.authentication/generated/org.apache.ace.authentication.jar;version=latest,\
-	org.apache.ace.nodelauncher.amazon;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.nodelauncher.amazon/generated/org.apache.ace.nodelauncher.amazon.jar;version=latest,\
-	org.apache.ace.configurator.serveruseradmin;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.configurator.serveruseradmin/generated/org.apache.ace.configurator.serveruseradmin.jar;version=latest,\
-	org.apache.ace.repository.impl;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.repository.impl/generated/org.apache.ace.repository.impl.jar;version=latest,\
-	org.apache.ace.deployment.provider.repositorybased;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.deployment.provider.repositorybased/generated/org.apache.ace.deployment.provider.repositorybased.jar;version=latest,\
-	osgi.cmpn;resolution=http://bundles.bndtools.org.s3.amazonaws.com/osgi.cmpn/osgi.cmpn-4.2.1.jar;version='[4.2.1,4.2.2)',\
-	org.apache.ace.deployment.verifier;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.deployment.verifier/generated/org.apache.ace.deployment.verifier.jar;version=latest,\
-	org.apache.felix.eventadmin;resolution=file:/Users/marcel/dev/ace-bndtools/cnf/repo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.2.14.jar;version='[1.2.14,1.2.15)',\
-	org.apache.ace.client.repository.helper.base;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.client.repository.helper.base/generated/org.apache.ace.client.repository.helper.base.jar;version=latest,\
-	org.apache.ace.authenticationprocessor.basicauth;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.authenticationprocessor.basicauth/generated/org.apache.ace.authenticationprocessor.basicauth.jar;version=latest,\
-	org.apache.ace.nodelauncher.ui;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.nodelauncher.ui/generated/org.apache.ace.nodelauncher.ui.jar;version=latest
+-runbundles: org.apache.felix.dependencymanager;version='[3.1.0,3.1.1)',\
+	org.apache.felix.useradmin;version='[0.9.9,1.0.0)',\
+	org.apache.felix.log;version='[1.0.1,1.0.2)',\
+	org.apache.felix.prefs;version='[1.0.4,1.0.5)',\
+	org.apache.felix.configadmin;version='[1.2.8,1.2.9)',\
+	org.apache.felix.eventadmin;version='[1.2.14,1.2.15)',\
+	org.apache.felix.gogo.runtime;version='[0.10.0,0.10.1)',\
+	org.apache.felix.gogo.shell;version='[0.10.0,0.10.1)',\
+	org.apache.felix.gogo.command;version='[0.12.0,0.12.1)',\
+	org.apache.felix.http.jetty;version='[2.2.0,2.2.1)',\
+	org.apache.felix.dependencymanager.shell;version='[3.0.1,3.0.2)',\
+	osgi.cmpn;version='[4.2.1,4.2.2)',\
+	com.vaadin;version='[6.5.1,6.5.2)',\
+	org.apache.ace.configurator.useradmin.task;version=latest,\
+	org.apache.ace.http.redirector;version=latest,\
+	org.apache.ace.target.mgmt.ui;version=latest,\
+	org.apache.ace.log.servlet;version=latest,\
+	org.apache.ace.deployment.streamgenerator;version=latest,\
+	org.apache.ace.authentication.api;version=latest,\
+	org.apache.ace.client.repository.impl;version=latest,\
+	org.apache.ace.tageditor;version=latest,\
+	org.apache.ace.client.repository.helper.bundle;version=latest,\
+	org.apache.ace.discovery.api;version=latest,\
+	org.apache.ace.client.rest;version=latest,\
+	org.apache.ace.range.api;version=latest,\
+	org.apache.ace.log;version=latest,\
+	org.apache.ace.authenticationprocessor.password;version=latest,\
+	org.apache.ace.webui.vaadin;version=latest,\
+	org.apache.ace.resourceprocessor.useradmin;version=latest,\
+	org.apache.ace.server.log.ui;version=latest,\
+	org.apache.ace.deployment.verifier.ui;version=latest,\
+	org.apache.ace.repository.api;version=latest,\
+	org.apache.ace.server.log.store;version=latest,\
+	org.apache.ace.client.repository.api;version=latest,\
+	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.obr.storage;version=latest,\
+	org.apache.ace.client.repository.helper.configuration;version=latest,\
+	org.apache.ace.consolelogger;version=latest,\
+	org.apache.ace.httplistener;version=latest,\
+	org.apache.ace.obr.servlet;version=latest,\
+	org.apache.ace.nodelauncher.api;version=latest,\
+	org.apache.ace.deployment.provider.api;version=latest,\
+	org.apache.ace.deployment.servlet;version=latest,\
+	org.apache.ace.scheduler;version=latest,\
+	org.apache.ace.obr.metadata;version=latest,\
+	org.apache.ace.configurator;version=latest,\
+	org.apache.ace.connectionfactory;version=latest,\
+	org.apache.ace.authentication;version=latest,\
+	org.apache.ace.nodelauncher.amazon;version=latest,\
+	org.apache.ace.configurator.serveruseradmin;version=latest,\
+	org.apache.ace.repository.impl;version=latest,\
+	org.apache.ace.deployment.provider.repositorybased;version=latest,\
+	org.apache.ace.deployment.verifier;version=latest,\
+	org.apache.ace.client.repository.helper.base;version=latest,\
+	org.apache.ace.authenticationprocessor.basicauth;version=latest,\
+	org.apache.ace.nodelauncher.ui;version=latest
 -runrepos: Workspace,\
 	Local Repository,\
 	Release
\ No newline at end of file

Modified: ace/sandbox/marrs/run-target/target.bndrun
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/run-target/target.bndrun?rev=1362476&r1=1362475&r2=1362476&view=diff
==============================================================================
--- ace/sandbox/marrs/run-target/target.bndrun (original)
+++ ace/sandbox/marrs/run-target/target.bndrun Tue Jul 17 12:55:19 2012
@@ -1,7 +1,7 @@
 -runfw: org.apache.felix.framework;version='[4,5)'
 -runee: JavaSE-1.6
--runbundles: org.apache.felix.gogo.command;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.command/org.apache.felix.gogo.command-0.12.0.jar;version='[0.12.0,0.12.1)',\
-	org.apache.felix.gogo.runtime;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-0.10.0.jar;version='[0.10.0,0.10.1)',\
-	org.apache.ace.managementagent;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.managementagent/generated/org.apache.ace.managementagent.jar;version=latest,\
-	org.apache.felix.gogo.shell;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar;version='[0.10.0,0.10.1)'
+-runbundles: org.apache.felix.gogo.command;version='[0.12.0,0.12.1)',\
+	org.apache.felix.gogo.runtime;version='[0.10.0,0.10.1)',\
+	org.apache.ace.managementagent;version=latest,\
+	org.apache.felix.gogo.shell;version='[0.10.0,0.10.1)'
 -runvm: -Dlog=true



Mime
View raw message