Mailing-List: contact commits-help@ace.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ace.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1359761 - in /ace/sandbox/marrs/org.apache.ace.itest:
 bnd.bnd
 src/org/apache/ace/it/IntegrationTestBase.java
Date: Tue, 10 Jul 2012 16:30:43 -0000
To: commits@ace.apache.org
From: marrs@apache.org
Message-Id: <20120710163043.BC3B92388860@eris.apache.org>

Author: marrs
Date: Tue Jul 10 16:30:43 2012
New Revision: 1359761

URL: http://svn.apache.org/viewvc?rev=1359761&view=rev
Log:
Small change in the way we fetch the bundle context.

Modified:
    ace/sandbox/marrs/org.apache.ace.itest/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.itest/src/org/apache/ace/it/IntegrationTestBase.java

Modified: ace/sandbox/marrs/org.apache.ace.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.itest/bnd.bnd?rev=1359761&r1=1359760&r2=1359761&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.itest/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.itest/bnd.bnd Tue Jul 10 16:30:43 2012
@@ -3,7 +3,6 @@
 	org.apache.ace.util;version=latest,\
 	org.apache.felix.dependencymanager,\
 	junit.osgi
-Export-Package: org.apache.ace.it
 -runrequire: bundle:(symbolicname=org.apache.felix.dependencymanager),\
 	bundle:(symbolicname=osgi.cmpn),\
 	bundle:(symbolicname=org.apache.felix.shell.tui)
@@ -14,5 +13,6 @@ Export-Package: org.apache.ace.it
 	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.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.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)',\
-	biz.aQute.junit;resolution=http://bundles.bndtools.org.s3.amazonaws.com/biz.aQute.junit/biz.aQute.junit-1.0.0.jar;version='[1.0.0,1.0.1)',\
 	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
+Private-Package: org.apache.ace.test.utils

Modified: ace/sandbox/marrs/org.apache.ace.itest/src/org/apache/ace/it/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.itest/src/org/apache/ace/it/IntegrationTestBase.java?rev=1359761&r1=1359760&r2=1359761&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.itest/src/org/apache/ace/it/IntegrationTestBase.java (original)
+++ ace/sandbox/marrs/org.apache.ace.itest/src/org/apache/ace/it/IntegrationTestBase.java Tue Jul 10 16:30:43 2012
@@ -59,7 +59,7 @@ public class IntegrationTestBase extends
      */
     private static final int SERVICE_TIMEOUT = 5;
 
-    protected BundleContext m_bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
+    protected BundleContext m_bundleContext;
     protected DependencyManager m_dependencyManager;
 
     /**
@@ -106,7 +106,7 @@ public class IntegrationTestBase extends
     }
 
     public void setUp() throws Exception {
-    	System.out.println("setup");
+    	m_bundleContext = FrameworkUtil.getBundle(IntegrationTestBase.class).getBundleContext();
         m_dependencyManager = new DependencyManager(m_bundleContext);
         Component[] components = getDependencies();
         ComponentCounter listener = new ComponentCounter(components);