directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1804883 - /directory/apacheds/branches/apacheds-value/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerOsgiTestBase.java
Date Sun, 13 Aug 2017 08:06:25 GMT
Author: elecharny
Date: Sun Aug 13 08:06:24 2017
New Revision: 1804883

URL: http://svn.apache.org/viewvc?rev=1804883&view=rev
Log:
minor formating

Modified:
    directory/apacheds/branches/apacheds-value/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerOsgiTestBase.java

Modified: directory/apacheds/branches/apacheds-value/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerOsgiTestBase.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerOsgiTestBase.java?rev=1804883&r1=1804882&r2=1804883&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerOsgiTestBase.java
(original)
+++ directory/apacheds/branches/apacheds-value/osgi-integ/src/test/java/org/apache/directory/server/osgi/integ/ServerOsgiTestBase.java
Sun Aug 13 08:06:24 2017
@@ -79,6 +79,7 @@ public abstract class ServerOsgiTestBase
         File targetTestClassesDir = new File( resource.getFile() );
         File targetDependenciesDir = new File( targetTestClassesDir.getParent(), "dependency"
);
         File[] files = targetDependenciesDir.listFiles();
+        
         for ( File file : files )
         {
             if ( !SKIPS.contains( file.getName() ) )
@@ -95,8 +96,10 @@ public abstract class ServerOsgiTestBase
             systemProperty( "logback.configurationFile" ).value(
                 "file:" + PathUtils.getBaseDir() + "/src/test/resources/logback.xml" ),
             systemPackages( "javax.xml.stream;version=1.0.0", "javax.xml.stream.util;version=1.0.0",
-                "javax.xml.stream.events;version=1.0.0" ), mavenBundle( "ch.qos.logback",
"logback-classic", "1.0.6" ),
-            mavenBundle( "ch.qos.logback", "logback-core", "1.0.6" ), junitBundles(),
+                "javax.xml.stream.events;version=1.0.0" ), 
+            mavenBundle( "ch.qos.logback", "logback-classic", "1.0.6" ),
+            mavenBundle( "ch.qos.logback", "logback-core", "1.0.6" ), 
+            junitBundles(),
             composite( dependencies.toArray( new Option[0] ) ) );
     }
 
@@ -116,12 +119,14 @@ public abstract class ServerOsgiTestBase
         boolean bundleFound = false;
         boolean bundleActive = false;
         Bundle[] bundles = context.getBundles();
+        
         for ( Bundle bundle : bundles )
         {
             //System.out.println( "### bundle=" + bundle + " " + bundle.getState() );
             if ( bundle != null && bundle.getSymbolicName() != null && bundle.getSymbolicName().equals(
bundleName ) )
             {
                 bundleFound = true;
+                
                 if ( bundle.getState() == Bundle.ACTIVE )
                 {
                     bundleActive = true;



Mime
View raw message