svn commit: r1601207 - in /aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx: ./ cm/ framework/ permissionadmin/ provisioning/

[jbonofre]

Author: jbonofre
Date: Sun Jun  8 09:44:38 2014
New Revision: 1601207

URL: http://svn.apache.org/r1601207
Log:
Merge branch 'ARIES-1006' into trunk

Removed:
    
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanWhiteboardTest.java
    
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanWhiteboardTest.java
    
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanWhiteboardTest.java
    
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanWhiteboardTest.java
    
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanWhiteboardTest.java
    
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanWhiteboardTest.java
    
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanWhiteboardTest.java
Modified:
    
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java

Modified: 
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java?rev=1601207&r1=1601206&r2=1601207&view=diff
==============================================================================
--- 
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
 (original)
+++ 
aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
 Sun Jun  8 09:44:38 2014
@@ -75,33 +75,22 @@ public abstract class AbstractIntegratio
                 when(localRepo != 
null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + 
localRepo))
          );
     }
-    
+
        protected Option jmxRuntime() {
                return composite(
                                baseOptions(),
                                mavenBundle("org.osgi", 
"org.osgi.compendium").versionAsInProject(),
                                mavenBundle("org.apache.aries", 
"org.apache.aries.util").versionAsInProject(),
                                mavenBundle("org.apache.felix", 
"org.apache.felix.configadmin").versionAsInProject(),
-                               jmxBundle(),
+                mavenBundle("org.apache.aries.jmx", 
"org.apache.aries.jmx").version("1.1.2-SNAPSHOT"),
+                mavenBundle("org.apache.aries.jmx", 
"org.apache.aries.jmx.core.whiteboard").version("1.1.2-SNAPSHOT"),
                                mavenBundle("org.apache.aries.jmx", 
"org.apache.aries.jmx.api").versionAsInProject(),
                                mavenBundle("org.apache.aries.jmx", 
"org.apache.aries.jmx.whiteboard").versionAsInProject(),
                                mavenBundle("org.apache.aries.testsupport", 
"org.apache.aries.testsupport.unit").versionAsInProject(),
                                mbeanServerBundle()
                                );
        }
-    
-       /**
-        * jmx bundle to provision. Override this with jmxWhiteBoardBundle for 
the whiteboard tests
-        * @return
-        */
-       protected MavenArtifactProvisionOption jmxBundle() {
-               return mavenBundle("org.apache.aries.jmx", 
"org.apache.aries.jmx").version("1.1.2-SNAPSHOT");
-       }
-       
-       protected MavenArtifactProvisionOption jmxWhiteBoardBundle() {
-               return mavenBundle("org.apache.aries.jmx", 
"org.apache.aries.jmx.core.whiteboard").version("1.1.2-SNAPSHOT");
-       }
-       
+
        protected Option mbeanServerBundle() {
                return provision(bundle()
                        .add(MbeanServerActivator.class)
@@ -180,7 +169,7 @@ public abstract class AbstractIntegratio
     }
        
     protected ObjectName waitForMBean(String name) {
-        return waitForMBean(name, 10);
+        return waitForMBean(name, 20);
     }
 
     protected ObjectName waitForMBean(String name, int timeoutInSeconds) {