Author: davidb
Date: Fri Oct 19 08:57:46 2012
New Revision: 1400006
URL: http://svn.apache.org/viewvc?rev=1400006&view=rev
Log:
Porting over changes made to the main JMX project to jmx-next from the
following commits:
r1363903 cumminsh [ARIES-862] Adding version ranges for jmx imports
r1365595 gnodet [ARIES-884] ClassCastException in JMX when installing some
bundles
r1366650 cumminsh [ARIES-862] Ensuring uber-bundles have correct package
versions for transitive dependencies by making them not transitive :)
Added:
aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/packageinfo
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml
Modified:
aries/trunk/sandbox/jmx-next/jmx-bundle/pom.xml
aries/trunk/sandbox/jmx-next/jmx-core/pom.xml
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/resources/ss-runner.properties
Added:
aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/packageinfo
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/packageinfo?rev=1400006&view=auto
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/packageinfo
(added)
+++
aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/packageinfo
Fri Oct 19 08:57:46 2012
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 1.1.0
Modified: aries/trunk/sandbox/jmx-next/jmx-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-bundle/pom.xml?rev=1400006&r1=1400005&r2=1400006&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/jmx-bundle/pom.xml (original)
+++ aries/trunk/sandbox/jmx-next/jmx-bundle/pom.xml Fri Oct 19 08:57:46 2012
@@ -56,18 +56,18 @@
!org.apache.aries.jmx*,
!org.osgi.service.framework,
!org.eclipse*,
- org.osgi.framework;version="1.5.0",
- org.osgi.service.cm;version="1.3.0";resolution:="optional",
-
org.osgi.service.permissionadmin;version="1.2.0";resolution:="optional",
-
org.osgi.service.provisioning;version="1.2.0";resolution:="optional",
- org.osgi.service.useradmin;version="1.1.0";resolution:="optional",
+ org.osgi.framework;version="[1.7.0,2.0)",
+ org.osgi.service.cm;version="[1.3.0,2.0)";resolution:="optional",
+
org.osgi.service.permissionadmin;version="[1.2.0,2.0)";resolution:="optional",
+
org.osgi.service.provisioning;version="[1.2.0,2.0)";resolution:="optional",
+
org.osgi.service.useradmin;version="[1.1.0,2.0)";resolution:="optional",
org.osgi.util.tracker,
- org.osgi.jmx;version="1.0.0",
- org.osgi.jmx.framework;version="1.5.0",
- org.osgi.jmx.service.cm;version="1.3.0",
- org.osgi.jmx.service.permissionadmin;version="1.2.0",
- org.osgi.jmx.service.provisioning;version="1.2.0",
- org.osgi.jmx.service.useradmin;version="1.1.0",
+ org.osgi.jmx;version="[1.1.0,2.0)",
+ org.osgi.jmx.framework;version="[1.7.0,2.0)",
+ org.osgi.jmx.service.cm;version="[1.3.0,2.0)",
+ org.osgi.jmx.service.permissionadmin;version="[1.2.0,2.0)",
+ org.osgi.jmx.service.provisioning;version="[1.2.0,2.0)",
+ org.osgi.jmx.service.useradmin;version="[1.1.0,2.0)",
*
</aries.osgi.import>
<aries.osgi.private.pkg>
Modified: aries/trunk/sandbox/jmx-next/jmx-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-core/pom.xml?rev=1400006&r1=1400005&r2=1400006&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/jmx-core/pom.xml (original)
+++ aries/trunk/sandbox/jmx-next/jmx-core/pom.xml Fri Oct 19 08:57:46 2012
@@ -45,18 +45,18 @@
</aries.osgi.activator>
<aries.osgi.import>
!org.apache.aries.jmx*,
- org.osgi.framework;version="1.5.0",
- org.osgi.service.cm;version="1.3.0";resolution:="optional",
-
org.osgi.service.permissionadmin;version="1.2.0";resolution:="optional",
-
org.osgi.service.provisioning;version="1.2.0";resolution:="optional",
- org.osgi.service.useradmin;version="1.1.0";resolution:="optional",
+ org.osgi.framework;version="[1.7.0,2.0)",
+ org.osgi.service.cm;version="[1.3.0,2.0)";resolution:="optional",
+
org.osgi.service.permissionadmin;version="[1.2.0,2.0)";resolution:="optional",
+
org.osgi.service.provisioning;version="[1.2.0,2.0)";resolution:="optional",
+
org.osgi.service.useradmin;version="[1.1.0,2.0)";resolution:="optional",
org.osgi.util.tracker,
- org.osgi.jmx;version="1.0.0",
- org.osgi.jmx.framework;version="1.5.0",
- org.osgi.jmx.service.cm;version="1.3.0",
- org.osgi.jmx.service.permissionadmin;version="1.2.0",
- org.osgi.jmx.service.provisioning;version="1.2.0",
- org.osgi.jmx.service.useradmin;version="1.1.0",
+ org.osgi.jmx;version="[1.1.0,2.0)",
+ org.osgi.jmx.framework;version="[1.7.0,1.8.0)",
+ org.osgi.jmx.service.cm;version="[1.3.0,1.4.0)",
+ org.osgi.jmx.service.permissionadmin;version="[1.2.0,1.3.0)",
+ org.osgi.jmx.service.provisioning;version="[1.2.0,1.3.0)",
+ org.osgi.jmx.service.useradmin;version="[1.1.0,1.2.0)",
*
</aries.osgi.import>
<!-- Export package versions are maintained in packageinfo files -->
Modified:
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java?rev=1400006&r1=1400005&r2=1400006&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java
Fri Oct 19 08:57:46 2012
@@ -17,7 +17,6 @@
package org.apache.aries.jmx;
import java.util.concurrent.ExecutorService;
-
import javax.management.StandardMBean;
import org.apache.aries.jmx.agent.JMXAgentContext;
@@ -35,9 +34,9 @@ import org.osgi.util.tracker.ServiceTrac
* compendium service should extend this class and implement the {@linkplain
#constructInjectMBean(Object)} and
* {@linkplain #getName()} methods
* </p>
- *
+ *
* @see MBeanHandler
- *
+ *
* @version $Rev$ $Date$
*/
public abstract class AbstractCompendiumHandler extends ServiceTracker
implements MBeanHandler {
@@ -45,9 +44,9 @@ public abstract class AbstractCompendium
protected final JMXAgentContext agentContext;
protected StandardMBean mbean;
protected Long trackedId;
-
+
/**
- *
+ *
* @param agentContext
* @param filter
*/
@@ -57,7 +56,7 @@ public abstract class AbstractCompendium
}
/**
- *
+ *
* @param agentContext
* @param clazz
*/
@@ -68,7 +67,7 @@ public abstract class AbstractCompendium
/*
* (non-Javadoc)
- *
+ *
* @see
org.osgi.util.tracker.ServiceTracker#addingService(org.osgi.framework.ServiceReference)
*/
public Object addingService(ServiceReference reference) {
@@ -78,8 +77,7 @@ public abstract class AbstractCompendium
//API stipulates versions for compendium services with static
ObjectName
//This shouldn't happen but added as a consistency check
if (trackedId != null) {
- String serviceDescription = (String)
((reference.getProperty(Constants.SERVICE_DESCRIPTION) != null) ?
- reference.getProperty(Constants.SERVICE_DESCRIPTION) :
reference.getProperty(Constants.OBJECTCLASS));
+ String serviceDescription = getServiceDescription(reference);
logger.log(LogService.LOG_WARNING, "Detected secondary
ServiceReference for [" + serviceDescription
+ "] with " + Constants.SERVICE_ID + " [" + serviceId + "]
Only 1 instance will be JMX managed");
} else {
@@ -100,20 +98,19 @@ public abstract class AbstractCompendium
/*
* (non-Javadoc)
- *
+ *
* @see
org.osgi.util.tracker.ServiceTracker#removedService(org.osgi.framework.ServiceReference,
java.lang.Object)
*/
public void removedService(ServiceReference reference, Object service) {
Logger logger = agentContext.getLogger();
Long serviceID = (Long) reference.getProperty(Constants.SERVICE_ID);
if (trackedId != null && !trackedId.equals(serviceID)) {
- String serviceDescription = (String)
((reference.getProperty(Constants.SERVICE_DESCRIPTION) != null) ?
- reference.getProperty(Constants.SERVICE_DESCRIPTION) :
reference.getProperty(Constants.OBJECTCLASS));
+ String serviceDescription = getServiceDescription(reference);
logger.log(LogService.LOG_WARNING, "ServiceReference for [" +
serviceDescription + "] with "
+ Constants.SERVICE_ID + " [" + serviceID + "] is not
currently JMX managed");
} else {
logger.log(LogService.LOG_INFO, "Unregistering MBean with
ObjectName [" + getName() + "] for service with "
- + Constants.SERVICE_ID + " [" + serviceID + "]");
+ + Constants.SERVICE_ID + " [" + serviceID + "]");
ExecutorService executor = agentContext.getRegistrationExecutor();
executor.submit(new Runnable() {
public void run() {
@@ -125,9 +122,29 @@ public abstract class AbstractCompendium
}
}
+ private String getServiceDescription(ServiceReference reference) {
+ String serviceDescription = (String)
reference.getProperty(Constants.SERVICE_DESCRIPTION);
+ if (serviceDescription == null) {
+ Object obj = reference.getProperty(Constants.OBJECTCLASS);
+ if (obj instanceof String) {
+ StringBuilder sb = new StringBuilder();
+ for (String s : (String[]) obj) {
+ if (sb.length() > 0) {
+ sb.append(", ");
+ }
+ sb.append(s);
+ }
+ serviceDescription = sb.toString();
+ } else {
+ serviceDescription = obj.toString();
+ }
+ }
+ return serviceDescription;
+ }
+
/**
* Gets the <code>StandardMBean</code> managed by this handler when the
backing service is available or null
- *
+ *
* @see org.apache.aries.jmx.MBeanHandler#getMbean()
*/
public StandardMBean getMbean() {
@@ -137,7 +154,7 @@ public abstract class AbstractCompendium
/**
* Implement this method to construct an appropriate {@link StandardMBean}
instance which is backed by the supplied
* service tracked by this handler
- *
+ *
* @param targetService
* the compendium service tracked by this handler
* @return The <code>StandardMBean</code> instance whose registration
lifecycle will be managed by this handler
Modified:
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java?rev=1400006&r1=1400005&r2=1400006&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleStateMBeanTest.java
Fri Oct 19 08:57:46 2012
@@ -79,7 +79,7 @@ public class BundleStateMBeanTest extend
// new TimeoutOption( 0 ),
PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
- CoreOptions.equinox().version("3.7.0.v20110613"),
+ CoreOptions.equinox().version("3.8.0.V20120529-1548"),
paxLogging("INFO"),
mavenBundle("org.apache.felix",
"org.apache.felix.configadmin"),
Modified:
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java?rev=1400006&r1=1400005&r2=1400006&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
Fri Oct 19 08:57:46 2012
@@ -80,7 +80,7 @@ public class FrameworkMBeanTest extends
// new TimeoutOption( 0 ),
PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
- CoreOptions.equinox().version("3.7.0.v20110613"),
+ CoreOptions.equinox().version("3.8.0.V20120529-1548"),
paxLogging("INFO"),
mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"),
Modified:
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java?rev=1400006&r1=1400005&r2=1400006&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java
Fri Oct 19 08:57:46 2012
@@ -53,7 +53,7 @@ public class PackageStateMBeanTest exten
public static Option[] configuration() {
return testOptions(
PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
- CoreOptions.equinox().version("3.7.0.v20110613"),
+ CoreOptions.equinox().version("3.8.0.V20120529-1548"),
paxLogging("INFO"),
mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"),
mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.api"),
Modified:
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java?rev=1400006&r1=1400005&r2=1400006&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/ServiceStateMBeanTest.java
Fri Oct 19 08:57:46 2012
@@ -80,7 +80,7 @@ public class ServiceStateMBeanTest exten
// new TimeoutOption( 0 ),
PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
- CoreOptions.equinox().version("3.7.0.v20110613"),
+ CoreOptions.equinox().version("3.8.0.V20120529-1548"),
paxLogging("INFO"),
mavenBundle("org.apache.felix",
"org.apache.felix.configadmin"),
Modified:
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java?rev=1400006&r1=1400005&r2=1400006&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java
Fri Oct 19 08:57:46 2012
@@ -25,6 +25,7 @@ import static org.ops4j.pax.swissbox.tin
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -63,7 +64,7 @@ public class BundleWiringStateMBeanTest
// new TimeoutOption( 0 ),
PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
- CoreOptions.equinox().version("3.7.0.v20110613"),
+ CoreOptions.equinox().version("3.8.0.V20120529-1548"),
paxLogging("INFO"),
mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
@@ -404,7 +405,11 @@ public class BundleWiringStateMBeanTest
Map<String, Object> aMap = new HashMap<String, Object>();
for (CompositeData jmxAttr : (Collection<CompositeData>)
jmxAttributes.values()) {
PropertyData<Object> pd = PropertyData.from(jmxAttr);
- aMap.put(pd.getKey(), pd.getValue());
+ Object val = pd.getValue();
+ if (val instanceof Object[]) {
+ val = Arrays.asList((Object [])val);
+ }
+ aMap.put(pd.getKey(), val);
}
return aMap;
}
Modified:
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java?rev=1400006&r1=1400005&r2=1400006&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/permissionadmin/PermissionAdminMBeanTest.java
Fri Oct 19 08:57:46 2012
@@ -53,7 +53,7 @@ public class PermissionAdminMBeanTest ex
public static Option[] configuration() {
return testOptions(
PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
- CoreOptions.equinox().version("3.7.0.v20110613"),
+ CoreOptions.equinox().version("3.8.0.V20120529-1548"),
paxLogging("INFO"),
mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx"),
mavenBundle("org.apache.aries.jmx", "org.apache.aries.jmx.api"),
Modified:
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java?rev=1400006&r1=1400005&r2=1400006&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
Fri Oct 19 08:57:46 2012
@@ -42,7 +42,11 @@ public class SsActivator extends Abstrac
new EquinoxPlatformBuilder( bundleContext, "3.5.0" ),
new EquinoxPlatformBuilder( bundleContext, "3.5.1" ),
new EquinoxPlatformBuilder( bundleContext, "3.6.0" ),
- new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110613" ),
+ new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110110" ),
+ new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110221" ),
+ new EquinoxPlatformBuilder( bundleContext, "3.8.0.V20110621" ),
+ new EquinoxPlatformBuilder( bundleContext, "3.8.0-SNAPSHOT" ),
+ new EquinoxPlatformBuilder( bundleContext, "3.8.0.V20120529-1548"),
new EquinoxPlatformBuilderSnapshot( bundleContext )
};
}
Added:
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml?rev=1400006&view=auto
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml
(added)
+++
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml
Fri Oct 19 08:57:46 2012
@@ -0,0 +1,8 @@
+<platform>
+
+ <name>Equinox 3.8.0</name>
+ <system>mvn:org.eclipse/org.eclipse.osgi/3.8.0.v20120529-1548</system>
+
+ <profile name="minimal" default="true"/>
+
+</platform>
\ No newline at end of file
Modified:
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/resources/ss-runner.properties
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-itests/src/test/resources/ss-runner.properties?rev=1400006&r1=1400005&r2=1400006&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/resources/ss-runner.properties
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/resources/ss-runner.properties
Fri Oct 19 08:57:46 2012
@@ -82,8 +82,11 @@ platform.equinox.3.5.0=org.ops4j.pax.run
platform.equinox.3.5.1=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
platform.equinox.3.6.0=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
platform.equinox.SNAPSHOT=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
-platform.equinox.V43PROTOTYPE-3.6.0.201003231329=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
-platform.equinox.3.7.0.V20110613=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
+platform.equinox.3.7.0.V20110110=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
+platform.equinox.3.7.0.V20110221=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
+platform.equinox.3.8.0.V20110621=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
+platform.equinox.3.8.0-SNAPSHOT=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
+platform.equinox.3.8.0.V20120529-1548=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
# Felix
platform.felix.1.0.0=org.ops4j.pax.runner.platform.felix.internal.Activator
platform.felix.1.0.1=org.ops4j.pax.runner.platform.felix.internal.Activator
