aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r1143949 - in /aries/trunk/jmx/jmx-itests: ./ src/test/java/org/apache/aries/jmx/cm/ src/test/java/org/apache/aries/jmx/framework/ src/test/java/org/apache/aries/jmx/permissionadmin/ src/test/java/org/apache/aries/jmx/provisioning/
Date Thu, 07 Jul 2011 18:14:05 GMT
Author: not
Date: Thu Jul  7 18:14:05 2011
New Revision: 1143949

URL: http://svn.apache.org/viewvc?rev=1143949&view=rev
Log:
ARIES-686 Add additional itests that test the JMX MBeans when registered with the whiteboard
pattern.

Added:
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanWhiteboardTest.java
  (with props)
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanWhiteboardTest.java
  (with props)
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanWhiteboardTest.java
  (with props)
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanWhiteboardTest.java
  (with props)
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanWhiteboardTest.java
  (with props)
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanWhiteboardTest.java
  (with props)
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanWhiteboardTest.java
  (with props)
Modified:
    aries/trunk/jmx/jmx-itests/pom.xml
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanTest.java
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java
    aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java

Modified: aries/trunk/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/pom.xml?rev=1143949&r1=1143948&r2=1143949&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ aries/trunk/jmx/jmx-itests/pom.xml Thu Jul  7 18:14:05 2011
@@ -52,6 +52,16 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.whiteboard</artifactId>
+            <version>0.3.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.core.whiteboard</artifactId>
+            <version>0.3.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>

Modified: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanTest.java?rev=1143949&r1=1143948&r2=1143949&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanTest.java
(original)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanTest.java
Thu Jul  7 18:14:05 2011
@@ -66,6 +66,7 @@ public class ConfigurationAdminMBeanTest
                         mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
                         mavenBundle("org.osgi", "org.osgi.compendium"),
                         mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"),
+                        mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.whiteboard"),
                         new Customizer() {
                             public InputStream customizeTestProbe(InputStream testProbe)
throws Exception {
                                 return modifyBundle(testProbe)

Added: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanWhiteboardTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanWhiteboardTest.java?rev=1143949&view=auto
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanWhiteboardTest.java
(added)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanWhiteboardTest.java
Thu Jul  7 18:14:05 2011
@@ -0,0 +1,44 @@
+/*
+ * 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 WARRANTIESOR 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.aries.jmx.cm;
+
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+
+public class ConfigurationAdminMBeanWhiteboardTest extends ConfigurationAdminMBeanTest
+{
+  @Configuration
+  public static Option[] configuration() {
+    Option[] options = ConfigurationAdminMBeanTest.configuration();
+    
+    for (int i = 0; i < options.length; i++)
+    {
+      if (options[i] instanceof MavenArtifactProvisionOption) {
+        MavenArtifactProvisionOption po = (MavenArtifactProvisionOption) options[i];
+        String url = po.getURL();
+        if (url.contains("mvn:org.apache.aries.jmx/org.apache.aries.jmx/")) {
+          options[i] = mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.core.whiteboard");
+        }
+      }
+    }
+    
+    return options;
+  }
+}
\ No newline at end of file

Propchange: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/cm/ConfigurationAdminMBeanWhiteboardTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java?rev=1143949&r1=1143948&r2=1143949&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
(original)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
Thu Jul  7 18:14:05 2011
@@ -62,6 +62,8 @@ public class BundleStateMBeanTest extend
                         mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
                         mavenBundle("org.osgi", "org.osgi.compendium"),
                         mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"),
+                        mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.api"),
+                        mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.whiteboard"),
                         mavenBundle("org.apache.aries", "org.apache.aries.util"),
                         provision(newBundle()
                                 .add(org.apache.aries.jmx.test.bundlea.Activator.class)

Added: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanWhiteboardTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanWhiteboardTest.java?rev=1143949&view=auto
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanWhiteboardTest.java
(added)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanWhiteboardTest.java
Thu Jul  7 18:14:05 2011
@@ -0,0 +1,45 @@
+/*
+ * 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 WARRANTIESOR 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.aries.jmx.framework;
+
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+
+public class BundleStateMBeanWhiteboardTest extends BundleStateMBeanTest
+{
+  @Configuration
+  public static Option[] configuration() {
+    Option[] options = BundleStateMBeanTest.configuration();
+    
+    for (int i = 0; i < options.length; i++)
+    {
+      if (options[i] instanceof MavenArtifactProvisionOption) {
+        MavenArtifactProvisionOption po = (MavenArtifactProvisionOption) options[i];
+        String url = po.getURL();
+        if (url.contains("mvn:org.apache.aries.jmx/org.apache.aries.jmx/")) {
+          options[i] = mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.core.whiteboard");
+        }
+      }
+    }
+    
+    return options;
+  }
+
+}

Propchange: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanWhiteboardTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java?rev=1143949&r1=1143948&r2=1143949&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
(original)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
Thu Jul  7 18:14:05 2011
@@ -53,6 +53,8 @@ public class FrameworkMBeanTest extends 
             mavenBundle("org.ops4j.pax.logging", "pax-logging-api"), 
             mavenBundle("org.ops4j.pax.logging", "pax-logging-service"), 
             mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"),
+            mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.api"),
+            mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.whiteboard"),
             mavenBundle("org.apache.aries", "org.apache.aries.util")
         );
         

Added: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanWhiteboardTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanWhiteboardTest.java?rev=1143949&view=auto
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanWhiteboardTest.java
(added)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanWhiteboardTest.java
Thu Jul  7 18:14:05 2011
@@ -0,0 +1,45 @@
+/*
+ * 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 WARRANTIESOR 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.aries.jmx.framework;
+
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+
+public class FrameworkMBeanWhiteboardTest extends FrameworkMBeanTest
+{
+  @Configuration
+  public static Option[] configuration() {
+    Option[] options = FrameworkMBeanTest.configuration();
+    
+    for (int i = 0; i < options.length; i++)
+    {
+      if (options[i] instanceof MavenArtifactProvisionOption) {
+        MavenArtifactProvisionOption po = (MavenArtifactProvisionOption) options[i];
+        String url = po.getURL();
+        if (url.contains("mvn:org.apache.aries.jmx/org.apache.aries.jmx/")) {
+          options[i] = mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.core.whiteboard");
+        }
+      }
+    }
+    
+    return options;
+  }
+
+}

Propchange: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanWhiteboardTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java?rev=1143949&r1=1143948&r2=1143949&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java
(original)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java
Thu Jul  7 18:14:05 2011
@@ -44,9 +44,13 @@ public class PackageStateMBeanTest exten
 
     @Configuration
     public static Option[] configuration() {
-        Option[] options = CoreOptions.options(CoreOptions.equinox(), mavenBundle("org.ops4j.pax.logging",
-                "pax-logging-api"), mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
mavenBundle(
-                "org.apache.aries.jmx", "org.apache.aries.jmx"),mavenBundle("org.apache.aries",
"org.apache.aries.util"));
+        Option[] options = CoreOptions.options(CoreOptions.equinox(), 
+            mavenBundle("org.ops4j.pax.logging", "pax-logging-api"), 
+            mavenBundle("org.ops4j.pax.logging", "pax-logging-service"), 
+            mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"),
+            mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.api"),
+            mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.whiteboard"),
+            mavenBundle("org.apache.aries", "org.apache.aries.util"));
         options = updateOptions(options);
         return options;
     }

Added: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanWhiteboardTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanWhiteboardTest.java?rev=1143949&view=auto
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanWhiteboardTest.java
(added)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanWhiteboardTest.java
Thu Jul  7 18:14:05 2011
@@ -0,0 +1,45 @@
+/*
+ * 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 WARRANTIESOR 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.aries.jmx.framework;
+
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+
+public class PackageStateMBeanWhiteboardTest extends PackageStateMBeanTest
+{
+  @Configuration
+  public static Option[] configuration() {
+    Option[] options = PackageStateMBeanTest.configuration();
+    
+    for (int i = 0; i < options.length; i++)
+    {
+      if (options[i] instanceof MavenArtifactProvisionOption) {
+        MavenArtifactProvisionOption po = (MavenArtifactProvisionOption) options[i];
+        String url = po.getURL();
+        if (url.contains("mvn:org.apache.aries.jmx/org.apache.aries.jmx/")) {
+          options[i] = mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.core.whiteboard");
+        }
+      }
+    }
+    
+    return options;
+  }
+
+}

Propchange: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanWhiteboardTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java?rev=1143949&r1=1143948&r2=1143949&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
(original)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
Thu Jul  7 18:14:05 2011
@@ -24,6 +24,8 @@ import static org.ops4j.pax.exam.CoreOpt
 import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.modifyBundle;
 import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
 import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
+import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup; 
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -69,6 +71,8 @@ public class ServiceStateMBeanTest exten
                         mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
                         mavenBundle("org.osgi", "org.osgi.compendium"),
                         mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"),
+                        mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.api"),
+                        mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.whiteboard"),
                         mavenBundle("org.apache.aries", "org.apache.aries.util"),
                         new Customizer() {
                             public InputStream customizeTestProbe(InputStream testProbe)
throws Exception {
@@ -103,7 +107,10 @@ public class ServiceStateMBeanTest exten
                                 		",org.osgi.service.cm")
                                 .set(Constants.BUNDLE_ACTIVATOR,
                                         org.apache.aries.jmx.test.bundleb.Activator.class.getName())
-                                .build(withBnd()))
+                                .build(withBnd()))//,
+                                /* For debugging, uncomment the next two lines */
+//                              vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
+//                              waitForFrameworkStartup()
                         );
         options = updateOptions(options);
         return options;

Added: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanWhiteboardTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanWhiteboardTest.java?rev=1143949&view=auto
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanWhiteboardTest.java
(added)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanWhiteboardTest.java
Thu Jul  7 18:14:05 2011
@@ -0,0 +1,45 @@
+/*
+ * 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 WARRANTIESOR 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.aries.jmx.framework;
+
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+
+public class ServiceStateMBeanWhiteboardTest extends ServiceStateMBeanTest
+{
+  @Configuration
+  public static Option[] configuration() {
+    Option[] options = ServiceStateMBeanTest.configuration();
+    
+    for (int i = 0; i < options.length; i++)
+    {
+      if (options[i] instanceof MavenArtifactProvisionOption) {
+        MavenArtifactProvisionOption po = (MavenArtifactProvisionOption) options[i];
+        String url = po.getURL();
+        if (url.contains("mvn:org.apache.aries.jmx/org.apache.aries.jmx/")) {
+          options[i] = mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.core.whiteboard");
+        }
+      }
+    }
+    
+    return options;
+  }
+
+}

Propchange: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanWhiteboardTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java?rev=1143949&r1=1143948&r2=1143949&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java
(original)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java
Thu Jul  7 18:14:05 2011
@@ -21,6 +21,8 @@ import static org.junit.Assert.assertNot
 import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
 import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
+import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup; 
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
 
 import java.io.IOException;
 
@@ -52,6 +54,8 @@ public class PermissionAdminMBeanTest ex
             mavenBundle("org.ops4j.pax.logging", "pax-logging-api"), 
             mavenBundle("org.ops4j.pax.logging", "pax-logging-service"), 
             mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"),
+            mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.api"),
+            mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.whiteboard"),
             mavenBundle("org.apache.aries", "org.apache.aries.util"),
             provision(newBundle()
                     .add(org.apache.aries.jmx.test.bundlea.Activator.class)
@@ -64,6 +68,9 @@ public class PermissionAdminMBeanTest ex
                     .set(Constants.BUNDLE_ACTIVATOR,
                             org.apache.aries.jmx.test.bundlea.Activator.class.getName())
                     .build(withBnd()))
+                    /* For debugging, uncomment the next two lines */
+//                     vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7778"),
+//                     waitForFrameworkStartup()
         );
         options = updateOptions(options);
         return options;

Added: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanWhiteboardTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanWhiteboardTest.java?rev=1143949&view=auto
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanWhiteboardTest.java
(added)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanWhiteboardTest.java
Thu Jul  7 18:14:05 2011
@@ -0,0 +1,45 @@
+/*
+ * 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 WARRANTIESOR 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.aries.jmx.permissionadmin;
+
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+
+public class PermissionAdminMBeanWhiteboardTest extends PermissionAdminMBeanTest
+{
+  @Configuration
+  public static Option[] configuration() {
+    Option[] options = PermissionAdminMBeanTest.configuration();
+    
+    for (int i = 0; i < options.length; i++)
+    {
+      if (options[i] instanceof MavenArtifactProvisionOption) {
+        MavenArtifactProvisionOption po = (MavenArtifactProvisionOption) options[i];
+        String url = po.getURL();
+        if (url.contains("mvn:org.apache.aries.jmx/org.apache.aries.jmx/")) {
+          options[i] = mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.core.whiteboard");
+        }
+      }
+    }
+    
+    return options;
+  }
+
+}

Propchange: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanWhiteboardTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java?rev=1143949&r1=1143948&r2=1143949&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java
(original)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanTest.java
Thu Jul  7 18:14:05 2011
@@ -63,7 +63,9 @@ public class ProvisioningServiceMBeanTes
                         mavenBundle("org.ops4j.pax.logging", "pax-logging-api"), 
                         mavenBundle("org.ops4j.pax.logging", "pax-logging-service"), 
                         mavenBundle("org.osgi", "org.osgi.compendium"), 
-                        mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"));
+                        mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.whiteboard"),
+                        mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"),
+                        mavenBundle("org.apache.aries", "org.apache.aries.util"));
         options = updateOptions(options);
         return options;
     }

Added: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanWhiteboardTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanWhiteboardTest.java?rev=1143949&view=auto
==============================================================================
--- aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanWhiteboardTest.java
(added)
+++ aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanWhiteboardTest.java
Thu Jul  7 18:14:05 2011
@@ -0,0 +1,45 @@
+/*
+ * 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 WARRANTIESOR 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.aries.jmx.provisioning;
+
+import org.apache.aries.jmx.permissionadmin.PermissionAdminMBeanTest;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+
+public class ProvisioningServiceMBeanWhiteboardTest extends ProvisioningServiceMBeanTest
+{
+  @Configuration
+  public static Option[] configuration() {
+    Option[] options = ProvisioningServiceMBeanTest.configuration();
+    
+    for (int i = 0; i < options.length; i++)
+    {
+      if (options[i] instanceof MavenArtifactProvisionOption) {
+        MavenArtifactProvisionOption po = (MavenArtifactProvisionOption) options[i];
+        String url = po.getURL();
+        if (url.contains("mvn:org.apache.aries.jmx/org.apache.aries.jmx/")) {
+          options[i] = mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.core.whiteboard");
+        }
+      }
+    }
+    
+    return options;
+  }
+}
\ No newline at end of file

Propchange: aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/provisioning/ProvisioningServiceMBeanWhiteboardTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message