ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1360745 [1/2] - in /ace/sandbox/marrs: build/ org.apache.ace.authentication.itest/ org.apache.ace.authentication/ org.apache.ace.authenticationprocessor.basicauth/ org.apache.ace.authenticationprocessor.clientcert/ org.apache.ace.authentic...
Date Thu, 12 Jul 2012 16:10:39 GMT
Author: jawi
Date: Thu Jul 12 16:10:37 2012
New Revision: 1360745

URL: http://svn.apache.org/viewvc?rev=1360745&view=rev
Log:
Renamed org.apache.ace.itest to org.apache.ace.test as it
contains both utility classes for the normal unit tests, as
well as the integration tests.


Added:
    ace/sandbox/marrs/org.apache.ace.test/
    ace/sandbox/marrs/org.apache.ace.test/.classpath   (with props)
    ace/sandbox/marrs/org.apache.ace.test/.project   (with props)
    ace/sandbox/marrs/org.apache.ace.test/.settings/
    ace/sandbox/marrs/org.apache.ace.test/.settings/org.eclipse.jdt.core.prefs
    ace/sandbox/marrs/org.apache.ace.test/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.test/build.xml   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/
    ace/sandbox/marrs/org.apache.ace.test/src/org/
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/ExampleTest.java   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/Options.java   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/packageinfo
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/constants/
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/constants/TestConstants.java   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/constants/packageinfo
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/utils/
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/utils/FileUtils.java   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/utils/NetUtils.java   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/utils/TestUtils.java   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/utils/Util.java   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/utils/deployment/
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/utils/deployment/BundleStreamGenerator.java   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/utils/deployment/TestData.java   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/utils/deployment/TestProvider.java   (with props)
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/utils/deployment/packageinfo
    ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/test/utils/packageinfo
    ace/sandbox/marrs/org.apache.ace.test/test/
Removed:
    ace/sandbox/marrs/org.apache.ace.itest/
Modified:
    ace/sandbox/marrs/build/bin-build.xml
    ace/sandbox/marrs/build/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.authentication/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.helper.bundle/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.client.repository.helper.configuration/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.deploymentadmin/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.deployment.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.deployment.provider.filebased/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.deployment.provider.repositorybased/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.deployment.servlet/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.deployment.streamgenerator/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.deployment.task.base/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.deployment.task/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.deployment.verifier/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.discovery.property/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.discovery.upnp/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.gateway.log.store/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.gateway.log/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.http.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.identification.ifconfig/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.identification.property/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.log.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.log.listener/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.log.servlet/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.log.task/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.log/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.managementagent/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.obr.servlet/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.obr.storage/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.processlauncher/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.range.api/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.repository.api/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.repository.ext/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.repository.impl/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.scheduler/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.server.log.store/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.webui.vaadin/bnd.bnd

Modified: ace/sandbox/marrs/build/bin-build.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/build/bin-build.xml?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/build/bin-build.xml (original)
+++ ace/sandbox/marrs/build/bin-build.xml Thu Jul 12 16:10:37 2012
@@ -65,7 +65,6 @@
 			<file file="../org.apache.ace.repository.servlet/generated/org.apache.ace.repository.servlet.jar" />
 			<file file="../org.apache.ace.obr.storage/generated/org.apache.ace.obr.storage.jar" />
 			<file file="../org.apache.ace.client.repository.helper.configuration/generated/org.apache.ace.client.repository.helper.configuration.jar" />
-			<file file="../org.apache.ace.consolelogger/generated/org.apache.ace.consolelogger.jar" />
 			<file file="../org.apache.ace.httplistener/generated/org.apache.ace.httplistener.jar" />
 			<file file="../org.apache.ace.obr.servlet/generated/org.apache.ace.obr.servlet.jar" />
 			<file file="../org.apache.ace.nodelauncher.api/generated/org.apache.ace.nodelauncher.api.jar" />
@@ -127,9 +126,16 @@
 				<include name="*.sh"/>
 			</tarfileset>
 		</tar>
+
 		<!-- create one giant ZIP-file with everything in it -->
 		<zip destfile="${server.zipball}">
-			<tarfileset src="${server.tarball}" />
+			<tarfileset dir="${target.server.dir}">
+				<include name="**"/>
+				<exclude name="*.sh"/>
+			</tarfileset>
+			<tarfileset dir="${target.server.dir}">
+				<include name="*.sh"/>
+			</tarfileset>
 		</zip>
 	</target>
 

Modified: ace/sandbox/marrs/build/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/build/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/build/bnd.bnd (original)
+++ ace/sandbox/marrs/build/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -68,5 +68,4 @@
     org.apache.ace.server.log.ui,\
     org.apache.ace.tageditor,\
     org.apache.ace.target.mgmt.ui,\
-    org.apache.ace.util,\
     org.apache.ace.webui.vaadin

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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.authentication.itest/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,9 +2,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 -buildpath: junit.osgi,\
 	osgi.core,\
 	osgi.cmpn,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.itest;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.log;version=latest,\
@@ -19,51 +18,50 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.obr.storage;version=latest
 -runfw: org.apache.felix.framework;version='[4,5)'
 -runbundles: \
-	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.knopflerfish.bundle.useradmin;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.knopflerfish.bundle.useradmin/org.knopflerfish.bundle.useradmin-2.0.2.jar;version='[2.0.2,2.0.3)',\
-	org.knopflerfish.log;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.knopflerfish.log/org.knopflerfish.log-2.0.2.jar;version='[2.0.2,2.0.3)',\
-	org.apache.felix.dependencymanager;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar;version='[3.1.0,3.1.1)',\
-	org.apache.felix.dependencymanager.shell;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager-3.1.0.jar;version='[3.0.1,3.0.2)',\
-	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.felix.eventadmin;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.2.14.jar;version='[1.2.14,1.2.15)',\
-	org.apache.felix.prefs;resolution=file:/Users/jawi/Sources/ace-marrs/cnf/repo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.2.14.jar;version='[1.0.4,1.0.5)',\
-	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.shell;resolution=http://bundles.bndtools.org.s3.amazonaws.com/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=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.shell.tui/org.apache.felix.shell.tui-1.4.1.jar;version='[1.4.1,1.4.2)',\
-	org.apache.ace.discovery.property;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.discovery.property/generated/org.apache.ace.discovery.property.jar;version=latest,\
-	org.apache.ace.log.task;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.log.task/generated/org.apache.ace.log.task.jar;version=latest,\
-	org.apache.ace.log;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.log/generated/org.apache.ace.log.jar;version=latest,\
-	org.apache.ace.client.repository.helper.bundle;resolution=file:/Users/jawi/Sources/ace-marrs/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/jawi/Sources/ace-marrs/org.apache.ace.discovery.api/generated/org.apache.ace.discovery.api.jar;version=latest,\
-	org.apache.ace.configurator.serveruseradmin;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.configurator.serveruseradmin/generated/org.apache.ace.configurator.serveruseradmin.jar;version=latest,\
-	org.apache.ace.range.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.range.api/generated/org.apache.ace.range.api.jar;version=latest,\
-	org.apache.ace.repository.impl;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.repository.impl/generated/org.apache.ace.repository.impl.jar;version=latest,\
-	org.apache.ace.authenticationprocessor.basicauth;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.authenticationprocessor.basicauth/generated/org.apache.ace.authenticationprocessor.basicauth.jar;version=latest,\
-	org.apache.ace.client.repository.helper.base;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.client.repository.helper.base/generated/org.apache.ace.client.repository.helper.base.jar;version=latest,\
-	org.apache.ace.repository.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.repository.api/generated/org.apache.ace.repository.api.jar;version=latest,\
-	org.apache.ace.client.repository.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.client.repository.api/generated/org.apache.ace.client.repository.api.jar;version=latest,\
-	org.apache.ace.server.log.store;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.server.log.store/generated/org.apache.ace.server.log.store.jar;version=latest,\
-	org.apache.ace.repository.servlet;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.repository.servlet/generated/org.apache.ace.repository.servlet.jar;version=latest,\
-	org.apache.ace.identification.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.identification.api/generated/org.apache.ace.identification.api.jar;version=latest,\
-	org.apache.ace.util;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.util/generated/org.apache.ace.util.jar;version=latest,\
-	org.apache.ace.resourceprocessor.useradmin;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.resourceprocessor.useradmin/generated/org.apache.ace.resourceprocessor.useradmin.jar;version=latest,\
-	org.apache.ace.gateway.log.store;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.gateway.log.store/generated/org.apache.ace.gateway.log.store.jar;version=latest,\
-	org.apache.ace.httplistener;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.httplistener/generated/org.apache.ace.httplistener.jar;version=latest,\
-	org.apache.ace.obr.storage;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.obr.storage/generated/org.apache.ace.obr.storage.jar;version=latest,\
-	org.apache.ace.itest;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.itest/generated/org.apache.ace.itest.jar;version=latest,\
-	org.apache.ace.client.repository.helper.configuration;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.client.repository.helper.configuration/generated/org.apache.ace.client.repository.helper.configuration.jar;version=latest,\
-	org.apache.ace.configurator.useradmin.task;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.configurator.useradmin.task/generated/org.apache.ace.configurator.useradmin.task.jar;version=latest,\
-	org.apache.ace.identification.property;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.identification.property/generated/org.apache.ace.identification.property.jar;version=latest,\
-	org.apache.ace.gateway.log;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.gateway.log/generated/org.apache.ace.gateway.log.jar;version=latest,\
-	org.apache.ace.obr.metadata;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.obr.metadata/generated/org.apache.ace.obr.metadata.jar;version=latest,\
-	org.apache.ace.authentication.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.authentication.api/generated/org.apache.ace.authentication.api.jar;version=latest,\
-	org.apache.ace.client.repository.impl;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.client.repository.impl/generated/org.apache.ace.client.repository.impl.jar;version=latest,\
-	org.apache.ace.connectionfactory;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.connectionfactory/generated/org.apache.ace.connectionfactory.jar;version=latest,\
-	org.apache.ace.authentication;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.authentication/generated/org.apache.ace.authentication.jar;version=latest,\
-	org.apache.ace.log.listener;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.log.listener/generated/org.apache.ace.log.listener.jar;version=latest,\
-	org.apache.ace.obr.servlet;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.obr.servlet/generated/org.apache.ace.obr.servlet.jar;version=latest,\
-	org.apache.ace.deployment.provider.api;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.deployment.provider.api/generated/org.apache.ace.deployment.provider.api.jar;version=latest,\
-	org.apache.ace.scheduler;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.scheduler/generated/org.apache.ace.scheduler.jar;version=latest,\
-	org.apache.ace.log.servlet;resolution=file:/Users/jawi/Sources/ace-marrs/org.apache.ace.log.servlet/generated/org.apache.ace.log.servlet.jar;version=latest
+	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.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)',\
+	org.apache.felix.eventadmin;version='[1.2.14,1.2.15)',\
+	org.apache.felix.prefs;version='[1.0.4,1.0.5)',\
+	org.apache.felix.http.jetty;version='[2.2.0,2.2.1)',\
+	org.apache.felix.shell;version='[1.4.2,1.4.3)',\
+	org.apache.felix.shell.tui;version='[1.4.1,1.4.2)',\
+	org.apache.ace.discovery.property;version=latest,\
+	org.apache.ace.log.task;version=latest,\
+	org.apache.ace.log;version=latest,\
+	org.apache.ace.client.repository.helper.bundle;version=latest,\
+	org.apache.ace.discovery.api;version=latest,\
+	org.apache.ace.configurator.serveruseradmin;version=latest,\
+	org.apache.ace.range.api;version=latest,\
+	org.apache.ace.repository.impl;version=latest,\
+	org.apache.ace.authenticationprocessor.basicauth;version=latest,\
+	org.apache.ace.client.repository.helper.base;version=latest,\
+	org.apache.ace.repository.api;version=latest,\
+	org.apache.ace.client.repository.api;version=latest,\
+	org.apache.ace.server.log.store;version=latest,\
+	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.identification.api;version=latest,\
+	org.apache.ace.resourceprocessor.useradmin;version=latest,\
+	org.apache.ace.gateway.log.store;version=latest,\
+	org.apache.ace.httplistener;version=latest,\
+	org.apache.ace.obr.storage;version=latest,\
+	org.apache.ace.test;version=latest,\
+	org.apache.ace.client.repository.helper.configuration;version=latest,\
+	org.apache.ace.configurator.useradmin.task;version=latest,\
+	org.apache.ace.identification.property;version=latest,\
+	org.apache.ace.gateway.log;version=latest,\
+	org.apache.ace.obr.metadata;version=latest,\
+	org.apache.ace.authentication.api;version=latest,\
+	org.apache.ace.client.repository.impl;version=latest,\
+	org.apache.ace.connectionfactory;version=latest,\
+	org.apache.ace.authentication;version=latest,\
+	org.apache.ace.log.listener;version=latest,\
+	org.apache.ace.obr.servlet;version=latest,\
+	org.apache.ace.deployment.provider.api;version=latest,\
+	org.apache.ace.scheduler;version=latest,\
+	org.apache.ace.log.servlet;version=latest
 Private-Package: org.apache.ace.it.authentication
 -runvm: -Dorg.osgi.service.http.port=9000
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.authentication/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.authentication/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.authentication/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.authentication/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -3,6 +3,6 @@
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.mockito.mockito-all,\
-	org.apache.ace.itest;version=latest
+	org.apache.ace.test;version=latest
 Private-Package: org.apache.ace.authentication.impl
 Bundle-Activator: org.apache.ace.authentication.impl.Activator
\ No newline at end of file

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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.authenticationprocessor.basicauth/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.authenticationprocessor.basicauth/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -4,7 +4,7 @@
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.authentication.api;version=latest,\
 	../cnf/lib/commons-codec-1.4.jar;version=file,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.mockito.mockito-all
 Private-Package: org.apache.ace.authenticationprocessor.basicauth,\
 	org.apache.commons.codec,\

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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.authenticationprocessor.clientcert/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.authenticationprocessor.clientcert/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -4,7 +4,7 @@
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.authentication.api;version=latest,\
 	../cnf/lib/bcprov-jdk14-140.jar;version=file,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.mockito.mockito-all
 Private-Package: org.apache.ace.authenticationprocessor.clientcert
 Bundle-Activator: org.apache.ace.authenticationprocessor.clientcert.Activator
\ No newline at end of file

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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.authenticationprocessor.password/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.authenticationprocessor.password/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -3,7 +3,7 @@
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.authentication.api;version=latest,\
 	../cnf/lib/commons-codec-1.4.jar;version=file,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.mockito.mockito-all
 Private-Package: org.apache.ace.authenticationprocessor.password,\
 	org.apache.commons.codec,\

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=1360745&r1=1360744&r2=1360745&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 Thu Jul 12 16:10:37 2012
@@ -3,7 +3,7 @@
 	org.apache.ace.client.repository.api;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.log;version=latest,\
-	org.apache.ace.util;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,\

Modified: ace/sandbox/marrs/org.apache.ace.client.repository.helper.bundle/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.repository.helper.bundle/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.repository.helper.bundle/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.client.repository.helper.bundle/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,6 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.client.repository.api;version=latest,\
-	org.apache.ace.util;version=latest
+	org.apache.ace.client.repository.api;version=latest
 Private-Package: org.apache.ace.client.repository.helper.bundle.impl
 Bundle-Activator: org.apache.ace.client.repository.helper.bundle.impl.Activator
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.client.repository.helper.configuration/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.client.repository.helper.configuration/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.repository.helper.configuration/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.client.repository.helper.configuration/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,7 @@
 -buildpath: org.apache.ace.client.repository.api;version=latest,\
 	org.apache.ace.client.repository.helper.base;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager

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=1360745&r1=1360744&r2=1360745&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 Thu Jul 12 16:10:37 2012
@@ -6,7 +6,7 @@
 	org.apache.ace.client.repository.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.util;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,\
 	org.apache.ace.repository.ext;version=latest,\
@@ -28,7 +28,6 @@ Private-Package: org.apache.ace.client.r
 	org.xmlpull.v1.wrapper,\
 	org.xmlpull.v1.wrapper.classic,\
 	org.apache.ace.client.repository.stateful.impl,\
-	org.apache.ace.util,\
 	org.apache.ace.repository.ext,\
 	org.apache.ace.repository.ext.impl,\
 	com.thoughtworks.xstream,\

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=1360745&r1=1360744&r2=1360745&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 Thu Jul 12 16:10:37 2012
@@ -2,9 +2,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 -buildpath: junit.osgi,\
 	osgi.core,\
 	osgi.cmpn,\
-	org.apache.ace.util;version=latest,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.log;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
@@ -20,12 +19,13 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest
 -runfw: org.apache.felix.framework;version='[4,5)'
--runbundles: org.apache.ace.itest;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.itest/generated/org.apache.ace.itest.jar;version=latest,\
-	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.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,\
-	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.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)',\
+-runbundles: \
+	org.apache.ace.test;version=latest,\
+	org.apache.felix.dependencymanager;version='[3.1.0,3.1.1)',\
+	org.apache.felix.configadmin;version='[1.2.8,1.2.9)',\
+	org.apache.ace.httplistener;version=latest,\
+	osgi.cmpn;version='[4.2.1,4.2.2)',\
+	org.apache.felix.eventadmin;version='[1.2.14,1.2.15)',\
 	org.apache.felix.http.jetty,\
 	org.apache.felix.shell,\
 	org.apache.felix.shell.tui,\
@@ -48,7 +48,6 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.deployment.task.base;version=latest,\
 	org.apache.ace.deployment.streamgenerator;version=latest,\
 	org.apache.ace.deployment.provider.base;version=latest,\
-	org.apache.ace.util;version=latest,\
 	org.apache.felix.prefs,\
 	org.knopflerfish.bundle.useradmin,\
 	org.knopflerfish.log,\

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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.client.rest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.client.rest/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -7,7 +7,7 @@
 	org.apache.ace.client.repository.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	javax.servlet,\
 	../cnf/lib/gson-1.7.1.jar;version=file,\
 	org.mockito.mockito-all

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=1360745&r1=1360744&r2=1360745&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 Thu Jul 12 16:10:37 2012
@@ -2,9 +2,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 -buildpath: junit.osgi,\
 	osgi.core,\
 	osgi.cmpn,\
-	org.apache.ace.util;version=latest,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.log;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
@@ -23,7 +22,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	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.ace.itest;version=latest,\
+    org.apache.ace.test;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.authentication.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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.configurator/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.configurator/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	../cnf/lib/commons-io-2.0.1.jar;version=file
 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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.connectionfactory/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.connectionfactory/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,6 +1,6 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	../cnf/lib/commons-codec-1.4.jar;version=file
 Private-Package: org.apache.ace.connectionfactory.impl,\
 	org.apache.commons.codec,\

Modified: ace/sandbox/marrs/org.apache.ace.deployment.deploymentadmin/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.deployment.deploymentadmin/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.deployment.deploymentadmin/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.deployment.deploymentadmin/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,6 +2,6 @@
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.deployment.api;version=latest,\
-	org.apache.ace.itest;version=latest
+	org.apache.ace.test;version=latest
 Private-Package: org.apache.ace.deployment.deploymentadmin
 Bundle-Activator: org.apache.ace.deployment.deploymentadmin.Activator
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.deployment.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.deployment.itest/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.deployment.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.deployment.itest/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,9 +2,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 -buildpath: junit.osgi,\
 	osgi.core,\
 	osgi.cmpn,\
-	org.apache.ace.util;version=latest,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.log;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
@@ -17,7 +16,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.deployment.servlet;version=latest,\
 	org.apache.ace.deployment.provider.filebased;version=latest
 -runfw: org.apache.felix.framework;version='[4,5)'
--runbundles: org.apache.ace.itest;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.itest/generated/org.apache.ace.itest.jar;version=latest,\
+-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.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,\
@@ -45,6 +44,6 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.deployment.task.base;version=latest,\
 	org.apache.ace.deployment.streamgenerator;version=latest,\
 	org.apache.ace.deployment.provider.base;version=latest,\
-	org.apache.ace.util;version=latest
+	org.apache.ace.test;version=latest
 Private-Package: org.apache.ace.it.deployment
 -runvm: -Dorg.osgi.service.http.port=9000 -ea
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.deployment.provider.filebased/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.deployment.provider.filebased/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.deployment.provider.filebased/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.deployment.provider.filebased/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
 	org.apache.ace.deployment.provider.base;version=latest
 Private-Package: org.apache.ace.deployment.provider.filebased,\

Modified: ace/sandbox/marrs/org.apache.ace.deployment.provider.repositorybased/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.deployment.provider.repositorybased/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.deployment.provider.repositorybased/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.deployment.provider.repositorybased/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.client.repository.api;version=latest,\
 	org.apache.ace.deployment.provider.base;version=latest,\

Modified: ace/sandbox/marrs/org.apache.ace.deployment.servlet/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.deployment.servlet/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.deployment.servlet/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.deployment.servlet/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,7 +2,7 @@
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	javax.servlet,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.deployment.api;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\

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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.deployment.streamgenerator/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.deployment.streamgenerator/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,7 +2,7 @@
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.itest;version=latest,\
+	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,\

Modified: ace/sandbox/marrs/org.apache.ace.deployment.task.base/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.deployment.task.base/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.deployment.task.base/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.deployment.task.base/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -5,7 +5,7 @@
 	org.apache.ace.scheduler.api;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.gateway.log.store;version=latest
 Private-Package: org.apache.ace.deployment.service.impl

Modified: ace/sandbox/marrs/org.apache.ace.deployment.task/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.deployment.task/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.deployment.task/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.deployment.task/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -4,7 +4,7 @@
 	org.apache.ace.deployment.api;version=latest,\
 	org.apache.ace.scheduler.api;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.deployment.task.base;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.gateway.log.store;version=latest

Modified: ace/sandbox/marrs/org.apache.ace.deployment.verifier/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.deployment.verifier/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.deployment.verifier/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.deployment.verifier/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,6 +1,6 @@
 -buildpath: osgi.cmpn,\
 	osgi.core;version=4.3.0.201102171602,\
-	org.apache.ace.itest;version=latest
+	org.apache.ace.test;version=latest
 Export-Package: org.apache.ace.deployment.verifier,\
 	org.osgi.service.log,\
 	org.osgi.framework.wiring

Modified: ace/sandbox/marrs/org.apache.ace.discovery.property/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.discovery.property/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.discovery.property/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.discovery.property/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,7 +2,7 @@
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.discovery.api;version=latest,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.mockito.mockito-all
 Private-Package: org.apache.ace.discovery.property,\
 	org.apache.ace.discovery.property.constants

Modified: ace/sandbox/marrs/org.apache.ace.discovery.upnp/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.discovery.upnp/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.discovery.upnp/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.discovery.upnp/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.easymock,\
 	org.apache.ace.discovery.api;version=latest
 Private-Package: org.apache.ace.discovery.upnp

Modified: ace/sandbox/marrs/org.apache.ace.gateway.log.store/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.gateway.log.store/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.gateway.log.store/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.gateway.log.store/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,7 +2,7 @@
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.identification.api;version=latest,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.log;version=latest
 Private-Package: org.apache.ace.target.log.store.impl
 Bundle-Activator: org.apache.ace.target.log.store.impl.Activator

Modified: ace/sandbox/marrs/org.apache.ace.gateway.log/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.gateway.log/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.gateway.log/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.gateway.log/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -6,7 +6,7 @@
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.log;version=latest,\
 	org.apache.ace.gateway.log.store;version=latest
 Private-Package: org.apache.ace.target.log,\

Modified: ace/sandbox/marrs/org.apache.ace.http.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.http.itest/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.http.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.http.itest/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -3,7 +3,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.log;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
@@ -13,7 +13,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.server.log.store;version=latest,\
 	javax.servlet
 -runfw: org.apache.felix.framework;version='[4,5)'
--runbundles: org.apache.ace.itest;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.itest/generated/org.apache.ace.itest.jar;version=latest,\
+-runbundles: org.apache.ace.test;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.itest/generated/org.apache.ace.itest.jar;version=latest,\
 	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.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,\

Modified: ace/sandbox/marrs/org.apache.ace.identification.ifconfig/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.identification.ifconfig/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.identification.ifconfig/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.identification.ifconfig/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,6 +2,6 @@
 	osgi.cmpn,\
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.itest;version=latest
+	org.apache.ace.test;version=latest
 Private-Package: org.apache.ace.identification.ifconfig
 Bundle-Activator: org.apache.ace.identification.ifconfig.Activator

Modified: ace/sandbox/marrs/org.apache.ace.identification.property/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.identification.property/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.identification.property/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.identification.property/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,7 +2,7 @@
 	org.apache.felix.dependencymanager,\
 	osgi.cmpn,\
 	osgi.core,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.mockito.mockito-all
 Private-Package: org.apache.ace.identification.property,\
 	org.apache.ace.identification.property.constants

Modified: ace/sandbox/marrs/org.apache.ace.log.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.log.itest/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.log.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.log.itest/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,9 +2,8 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 -buildpath: junit.osgi,\
 	osgi.core,\
 	osgi.cmpn,\
-	org.apache.ace.util;version=latest,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.log;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
@@ -13,7 +12,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.identification.property;version=latest,\
 	org.apache.ace.server.log.store;version=latest
 -runfw: org.apache.felix.framework;version='[4,5)'
--runbundles: org.apache.ace.itest;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.itest/generated/org.apache.ace.itest.jar;version=latest,\
+-runbundles: org.apache.ace.test;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.itest/generated/org.apache.ace.itest.jar;version=latest,\
 	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.apache.ace.identification.property;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.identification.property/generated/org.apache.ace.identification.property.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)',\
@@ -30,7 +29,6 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.ace.log;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.log/generated/org.apache.ace.log.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.identification.api;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.identification.api/generated/org.apache.ace.identification.api.jar;version=latest,\
-	org.apache.ace.util;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.util/generated/org.apache.ace.util.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.gateway.log.store;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.gateway.log.store/generated/org.apache.ace.gateway.log.store.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)',\

Modified: ace/sandbox/marrs/org.apache.ace.log.listener/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.log.listener/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.log.listener/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.log.listener/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.log;version=latest
 Private-Package: org.apache.ace.log.listener
 Bundle-Activator: org.apache.ace.log.listener.Activator
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.log.servlet/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.log.servlet/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.log.servlet/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.log.servlet/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.log;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	javax.servlet,\

Modified: ace/sandbox/marrs/org.apache.ace.log.task/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.log.task/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.log.task/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.log.task/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\

Modified: ace/sandbox/marrs/org.apache.ace.log/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.log/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.log/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.log/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,3 +1,4 @@
--buildpath: org.apache.ace.range.api;version=latest
+-buildpath: org.apache.ace.range.api;version=latest,\
+	org.apache.ace.test;version=latest
 Export-Package: org.apache.ace.log
 Private-Package: org.apache.ace.log.util
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.managementagent/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.managementagent/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.managementagent/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.managementagent/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -29,7 +29,7 @@ Import-Package: !javax.swing,\
 	!javax.microedition.io,\
 	!org.osgi.service.condpermadmin,\
 	!javax.net.ssl,\
-	!org.apache.ace.util,\
+	!org.apache.ace.test,\
 	!org.apache.ace.target.log,\
 	!org.apache.felix.dm.tracker,\
 	!org.osgi.service.useradmin,\

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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,7 +2,7 @@
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.nodelauncher.api;version=latest,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	com.google.inject,\
 	com.google.gson,\
 	com.google.inject.assistedinject,\

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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.obr.metadata/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.obr.metadata/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.util;version=latest,\
+	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

Modified: ace/sandbox/marrs/org.apache.ace.obr.servlet/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.obr.servlet/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.obr.servlet/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.obr.servlet/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,7 +2,7 @@
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	javax.servlet,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.obr.metadata;version=latest,\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.obr.storage;version=latest

Modified: ace/sandbox/marrs/org.apache.ace.obr.storage/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.obr.storage/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.obr.storage/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.obr.storage/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.obr.metadata;version=latest
 Private-Package: org.apache.ace.obr.storage.file,\
 	org.apache.ace.obr.storage.file.constants

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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.processlauncher/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.processlauncher/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,5 +1,5 @@
 -buildpath: org.apache.felix.dependencymanager,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.mockito.mockito-all,\
 	osgi.core,\
 	osgi.cmpn,\

Modified: ace/sandbox/marrs/org.apache.ace.range.api/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.range.api/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.range.api/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.range.api/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,2 +1,2 @@
--buildpath: org.apache.ace.itest;version=latest
+-buildpath: org.apache.ace.test;version=latest
 Export-Package: org.apache.ace.range
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.repository.api/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.repository.api/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.repository.api/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.repository.api/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,3 +1,3 @@
--buildpath: org.apache.ace.util;version=latest,\
+-buildpath: org.apache.ace.test;version=latest,\
 	org.apache.ace.range.api;version=latest
 Export-Package: org.apache.ace.repository
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.repository.ext/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.repository.ext/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.repository.ext/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.repository.ext/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -1,7 +1,7 @@
 -buildpath: osgi.core,\
 	osgi.cmpn,\
 	javax.servlet,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\

Modified: ace/sandbox/marrs/org.apache.ace.repository.impl/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.repository.impl/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.repository.impl/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.repository.impl/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -5,7 +5,7 @@
 	org.apache.ace.repository.ext;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.itest;version=latest
+	org.apache.ace.test;version=latest
 Private-Package: org.apache.ace.repository.impl,\
 	org.apache.ace.repository.impl.constants
 Bundle-Activator: org.apache.ace.repository.impl.Activator
\ No newline at end of file

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=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.repository.itest/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -3,8 +3,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	osgi.core;version='[4.1,5)',\
 	osgi.cmpn,\
 	org.mockito.mockito-all,\
-	org.apache.ace.itest;version=latest,\
-	org.apache.ace.util;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
@@ -20,7 +19,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 	org.apache.felix.http.jetty;version='[2.2.0,2.2.1)',\
 	org.apache.ace.authentication.api;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
-	org.apache.ace.itest;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\

Modified: ace/sandbox/marrs/org.apache.ace.scheduler/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.scheduler/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.scheduler/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.scheduler/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -2,6 +2,6 @@
 	osgi.cmpn,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.scheduler.api;version=latest,\
-	org.apache.ace.itest;version=latest
+	org.apache.ace.test;version=latest
 Private-Package: org.apache.ace.scheduler
 Bundle-Activator: org.apache.ace.scheduler.Activator
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.server.log.store/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.server.log.store/bnd.bnd?rev=1360745&r1=1360744&r2=1360745&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.server.log.store/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.server.log.store/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -3,7 +3,7 @@
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.log;version=latest,\
-	org.apache.ace.itest;version=latest
+	org.apache.ace.test;version=latest
 Private-Package: org.apache.ace.server.log.store.impl
 Bundle-Activator: org.apache.ace.server.log.store.impl.Activator
 Export-Package: org.apache.ace.server.log.store
\ No newline at end of file

Added: ace/sandbox/marrs/org.apache.ace.test/.classpath
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.test/.classpath?rev=1360745&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.test/.classpath (added)
+++ ace/sandbox/marrs/org.apache.ace.test/.classpath Thu Jul 12 16:10:37 2012
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Propchange: ace/sandbox/marrs/org.apache.ace.test/.classpath
------------------------------------------------------------------------------
    svn:eol-style = native

Added: ace/sandbox/marrs/org.apache.ace.test/.project
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.test/.project?rev=1360745&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.test/.project (added)
+++ ace/sandbox/marrs/org.apache.ace.test/.project Thu Jul 12 16:10:37 2012
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.ace.test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

Propchange: ace/sandbox/marrs/org.apache.ace.test/.project
------------------------------------------------------------------------------
    svn:eol-style = native

Added: ace/sandbox/marrs/org.apache.ace.test/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.test/.settings/org.eclipse.jdt.core.prefs?rev=1360745&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.test/.settings/org.eclipse.jdt.core.prefs (added)
+++ ace/sandbox/marrs/org.apache.ace.test/.settings/org.eclipse.jdt.core.prefs Thu Jul 12 16:10:37 2012
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

Added: ace/sandbox/marrs/org.apache.ace.test/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.test/bnd.bnd?rev=1360745&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.test/bnd.bnd (added)
+++ ace/sandbox/marrs/org.apache.ace.test/bnd.bnd Thu Jul 12 16:10:37 2012
@@ -0,0 +1,18 @@
+-buildpath: osgi.core,\
+	osgi.cmpn,\
+	org.apache.ace.deployment.provider.api;version=latest,\
+	org.apache.felix.dependencymanager,\
+	junit.osgi
+-runfw: org.apache.felix.framework;version='[4,5)'
+-runee: JavaSE-1.6
+-runbundles: \
+	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.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.apache.felix.shell;resolution=http://bundles.bndtools.org.s3.amazonaws.com/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=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.shell.tui/org.apache.felix.shell.tui-1.4.1.jar;version='[1.4.1,1.4.2)',\
+	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)'
+Export-Package: org.apache.ace.it,\
+	org.apache.ace.test.constants,\
+	org.apache.ace.test.utils,\
+	org.apache.ace.test.utils.deployment
+

Added: ace/sandbox/marrs/org.apache.ace.test/build.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.test/build.xml?rev=1360745&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.test/build.xml (added)
+++ ace/sandbox/marrs/org.apache.ace.test/build.xml Thu Jul 12 16:10:37 2012
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="project" default="build"> 
+	<import file="../cnf/build.xml"/>
+</project>

Propchange: ace/sandbox/marrs/org.apache.ace.test/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/ExampleTest.java
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/ExampleTest.java?rev=1360745&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/ExampleTest.java (added)
+++ ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/ExampleTest.java Thu Jul 12 16:10:37 2012
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.it;
+
+import java.io.IOException;
+
+import junit.framework.Assert;
+
+import org.apache.felix.dm.Component;
+import org.osgi.service.packageadmin.PackageAdmin;
+
+/**
+ * This class serves as a minimal example of our integration tests. Also, if this test fails, something is likely
+ * wrong with the environment
+ */
+public class ExampleTest extends IntegrationTestBase {
+
+//    @Configuration
+//    public Option[] configuration() {
+//        return options(
+//            // you can add additional directives, e.g. systemProperty or VMOptions here
+//            junitBundles(),
+//            provision(
+//                Osgi.compendium(),
+//                Felix.dependencyManager()
+//                // add additional bundles here
+//            )
+//        );
+//    }
+
+    protected void before() throws IOException {
+        // configure the services you need; you cannot use the injected members yet
+    }
+
+    protected Component[] getDependencies() {
+        return new Component[] {
+                // create Dependency Manager components that should be started before the
+                // test starts.
+                createComponent()
+                    .setImplementation(this)
+                    .add(createServiceDependency()
+                        .setService(PackageAdmin.class)
+                        .setRequired(true))
+        };
+    }           
+
+    // You can inject services as usual.
+    private volatile PackageAdmin m_packageAdmin;
+
+    public void testExample() throws Exception {
+        Assert.assertEquals("Hey, who stole my package!",
+                0,
+                m_packageAdmin.getExportedPackage("org.osgi.framework").getExportingBundle().getBundleId());
+    }
+}

Propchange: ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/ExampleTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java?rev=1360745&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java (added)
+++ ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java Thu Jul 12 16:10:37 2012
@@ -0,0 +1,345 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ace.it;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.ace.test.utils.Util.properties;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import junit.framework.TestCase;
+
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentDependencyDeclaration;
+import org.apache.felix.dm.ComponentStateListener;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.ServiceDependency;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * Base class for integration tests. There is no technical reason to use this, but it might make
+ * your life easier.<br>
+ * <br>
+ * {@link org.apache.ace.it.ExampleTest} shows a minimal example of an integration test.
+ *
+ */
+public class IntegrationTestBase extends TestCase {
+    private static class ComponentCounter implements ComponentStateListener {
+        private final List<Component> m_components = new ArrayList<Component>();
+        private final CountDownLatch m_latch;
+
+        public ComponentCounter(Component[] components) {
+            m_components.addAll(Arrays.asList(components));
+            m_latch = new CountDownLatch(components.length);
+        }
+
+        public String componentsString() {
+            StringBuilder result = new StringBuilder();
+            for (Component component : m_components) {
+                result.append(component).append('\n');
+                for (ComponentDependencyDeclaration dependency : (List<ComponentDependencyDeclaration>) component.getDependencies()) {
+                    result.append("  ")
+                            .append(dependency.toString())
+                            .append(" ")
+                            .append(ComponentDependencyDeclaration.STATE_NAMES[dependency.getState()])
+                            .append('\n');
+                }
+                result.append('\n');
+            }
+            return result.toString();
+        }
+
+        public void started(Component component) {
+            m_components.remove(component);
+            m_latch.countDown();
+        }
+
+        public void starting(Component component) {
+        }
+
+        public void stopped(Component component) {
+        }
+
+        public void stopping(Component component) {
+        }
+
+        public boolean waitForEmpty(long timeout, TimeUnit unit) throws InterruptedException {
+            return m_latch.await(timeout, unit);
+        }
+    }
+    
+    /**
+     * If we have to wait for a service, wait this amount of seconds.
+     */
+    private static final int SERVICE_TIMEOUT = 5;
+    protected BundleContext m_bundleContext;
+
+    protected DependencyManager m_dependencyManager;
+
+    /**
+     * The 'after' callback will be called after all components from {@link #getDependencies} have been
+     * started.<br>
+     * <br>
+     * The {@link #after} callback is most useful for configuring additional services after all mandatory 
+     * services are resolved.
+     */
+    protected void after() throws Exception {}
+
+    /**
+     * The 'before' callback will be called after the components from {@link #getDependencies} have been
+     * added, but you cannot necessarily rely on injected members here. You can use the {@link #configure} and
+     * {@link #configureFactory} methods, as well as the {@link #getService} methods.<br>
+     * <br>
+     * The {@link #before} callback is most useful for configuring services that have been provisioned
+     * in the 'configuration' method.
+     */
+    protected void before() throws Exception {}
+
+    /**
+     * Write configuration for a single service. For example,
+     * <pre>
+     *   configure("org.apache.felix.http",
+     *     "org.osgi.service.http.port", "1234");
+     * </pre>
+     */
+    protected void configure(String pid, String... configuration) throws IOException {
+        Properties props = properties(configuration);
+        Configuration config = getConfiguration(pid);
+        config.update(props);
+    }
+
+    /**
+     * Creates a factory configuration with the given properties, just like {@link #configure}.
+     * @return The PID of newly created configuration.
+     */
+    protected String configureFactory(String factoryPid, String... configuration) throws IOException {
+        Properties props = properties(configuration);
+        Configuration config = createFactoryConfiguration(factoryPid);
+        config.update(props);
+        return config.getPid();
+    }
+    
+    /**
+     * Bridge method for dependency manager.
+     * 
+     * @return a new {@link Component}.
+     */
+    protected Component createComponent() {
+        return m_dependencyManager.createComponent();
+    }
+    
+    /**
+     * Creates a new factory configuration.
+     * 
+     * @param factoryPid the PID of the factory to create a new configuration for.
+     * @return a new {@link Configuration} object, never <code>null</code>.
+     * @throws IOException if access to the persistent storage failed.
+     */
+    protected Configuration createFactoryConfiguration(String factoryPid) throws IOException {
+        ConfigurationAdmin admin = getService(ConfigurationAdmin.class);
+        return admin.createFactoryConfiguration(factoryPid, null);
+    }
+
+    /**
+     * Bridge method for dependency manager.
+     * 
+     * @return a new {@link ServiceDependency}.
+     */
+    protected ServiceDependency createServiceDependency() {
+        return m_dependencyManager.createServiceDependency();
+    }
+
+    /**
+     * Gets an existing configuration or creates a new one, in case it does not exist.
+     * 
+     * @param pid the PID of the configuration to return.
+     * @return a {@link Configuration} instance, never <code>null</code>.
+     * @throws IOException if access to the persistent storage failed.
+     */
+    protected Configuration getConfiguration(String pid) throws IOException {
+        ConfigurationAdmin admin = getService(ConfigurationAdmin.class);
+        return admin.getConfiguration(pid, null);
+    }
+
+    /**
+     * Gets a list of components that must be started before the test is started; this useful to
+     * (a) add additional services, e.g. services that should be picked up by the service under
+     * test, or (b) to declare 'this' as a component, and get services injected.
+     */
+    protected Component[] getDependencies() {
+        return new Component[0];
+    }
+
+    /**
+     * Returns a list of strings representing the result of the given request URL.
+     * 
+     * @param requestURL the URL to access and return the response as strings.
+     * @return a list of strings, never <code>null</code>.
+     * @throws IOException in case accessing the requested URL failed.
+     */
+    protected List<String> getResponse(String requestURL) throws IOException {
+    	return getResponse(new URL(requestURL));
+    }
+
+    /**
+     * Returns a list of strings representing the result of the given request URL.
+     * 
+     * @param requestURL the URL to access and return the response as strings.
+     * @return a list of strings, never <code>null</code>.
+     * @throws IOException in case accessing the requested URL failed.
+     */
+    protected List<String> getResponse(URL requestURL) throws IOException {
+        List<String> result = new ArrayList<String>();
+        InputStream in = null;
+        try {
+            in = requestURL.openConnection().getInputStream();
+            byte[] response = new byte[in.available()];
+            in.read(response);
+
+            final StringBuilder element = new StringBuilder();
+            for (byte b : response) {
+                switch(b) {
+                    case '\n' :
+                        result.add(element.toString());
+                        element.delete(0, element.length());
+                        break;
+                    default :
+                        element.append((char) b);
+                }
+            }
+            if (element.length() > 0) {
+            	result.add(element.toString());
+            }
+        }
+        finally {
+            try {
+                in.close();
+            }
+            catch (Exception e) {
+                // no problem.
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Convenience method to return an OSGi service.
+     * 
+     * @param serviceClass the service class to return.
+     * @return a service instance, can be <code>null</code>.
+     */
+    protected <T> T getService(Class<T> serviceClass) {
+        try {
+            return getService(serviceClass, null);
+        }
+        catch (InvalidSyntaxException e) {
+            return null;
+            // Will not happen, since we don't pass in a filter.
+        }
+    }
+
+    /**
+     * Convenience method to return an OSGi service.
+     * 
+     * @param serviceClass the service class to return;
+     * @param filterString the (optional) filter string, can be <code>null</code>.
+     * @return a service instance, can be <code>null</code>.
+     */
+    @SuppressWarnings("unchecked")
+    protected <T> T getService(Class<T> serviceClass, String filterString) throws InvalidSyntaxException {
+        T serviceInstance = null;
+
+        ServiceTracker serviceTracker;
+        if (filterString == null) {
+            serviceTracker = new ServiceTracker(m_bundleContext, serviceClass.getName(), null);
+        }
+        else {
+            String classFilter = "(" + Constants.OBJECTCLASS + "=" + serviceClass.getName() + ")";
+            filterString = "(&" + classFilter + filterString + ")";
+            serviceTracker = new ServiceTracker(m_bundleContext, m_bundleContext.createFilter(filterString), null);
+        }
+        serviceTracker.open();
+        try {
+            serviceInstance = (T) serviceTracker.waitForService(SERVICE_TIMEOUT * 1000);
+
+            if (serviceInstance == null) {
+                fail(serviceClass + " service not found.");
+            }
+            else {
+                return serviceInstance;
+            }
+        }
+        catch (InterruptedException e) {
+            e.printStackTrace();
+            fail(serviceClass + " service not available: " + e.toString());
+        }
+
+        return serviceInstance;
+    }
+
+    /**
+     * Set up of this test case.
+     */
+    protected final void setUp() throws Exception {
+    	m_bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+        m_dependencyManager = new DependencyManager(m_bundleContext);
+
+        Component[] components = getDependencies();
+        ComponentCounter listener = new ComponentCounter(components);
+
+        // Register our listener for all the services...
+        for (Component component : components) {
+            component.addStateListener(listener);
+        }
+
+        // Then give them to the dependency manager...
+        for (Component component : components) {
+            m_dependencyManager.add(component);
+        }
+
+		// Call back the implementation...
+		before();
+
+        // And wait for all components to come online.
+        try {
+            if (!listener.waitForEmpty(SERVICE_TIMEOUT, SECONDS)) {
+                fail("Not all components were started. Still missing the following:\n" + listener.componentsString());
+            }
+            
+        	after();
+        }
+        catch (InterruptedException e) {
+            fail("Interrupted while waiting for services to get started.");
+        }
+    }
+}

Propchange: ace/sandbox/marrs/org.apache.ace.test/src/org/apache/ace/it/IntegrationTestBase.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message