You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by da...@apache.org on 2012/01/03 17:27:39 UTC
svn commit: r1226850 - in /aries/trunk/sandbox/jmx-next:
jmx-api/src/main/java/org/osgi/jmx/framework/
jmx-api/src/main/java/org/osgi/jmx/framework/wiring/ jmx-bundle/
jmx-itests/src/test/java/org/apache/aries/jmx/framework/
Author: davidb
Date: Tue Jan 3 16:27:39 2012
New Revision: 1226850
URL: http://svn.apache.org/viewvc?rev=1226850&view=rev
Log:
Fixed package versions and removed uses clauses from the pom.xml
Added:
aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/packageinfo
Modified:
aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo
aries/trunk/sandbox/jmx-next/jmx-bundle/pom.xml
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/PackageStateMBeanTest.java
Modified: aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo?rev=1226850&r1=1226849&r2=1226850&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo (original)
+++ aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/packageinfo Tue Jan 3 16:27:39 2012
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 1.5.0
+version 1.7.0
Added: aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/packageinfo?rev=1226850&view=auto
==============================================================================
--- aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/packageinfo (added)
+++ aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/packageinfo Tue Jan 3 16:27:39 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.7.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=1226850&r1=1226849&r2=1226850&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/jmx-bundle/pom.xml (original)
+++ aries/trunk/sandbox/jmx-next/jmx-bundle/pom.xml Tue Jan 3 16:27:39 2012
@@ -43,12 +43,13 @@
</aries.osgi.activator>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export>
- org.osgi.jmx;uses:="javax.management.openmbean",
- org.osgi.jmx.framework;uses:="org.osgi.jmx,javax.management.openmbean",
- org.osgi.jmx.service.cm;uses:="javax.management.openmbean",
- org.osgi.jmx.service.permissionadmin;uses:="org.osgi.jmx",
- org.osgi.jmx.service.provisioning;uses:="javax.management.openmbean",
- org.osgi.jmx.service.useradmin;uses:="org.osgi.jmx,javax.management.openmbean",
+ org.osgi.jmx,
+ org.osgi.jmx.framework,
+ org.osgi.jmx.framework.wiring,
+ org.osgi.jmx.service.cm,
+ org.osgi.jmx.service.permissionadmin,
+ org.osgi.jmx.service.provisioning,
+ org.osgi.jmx.service.useradmin,
org.apache.aries.jmx.codec
</aries.osgi.export>
<aries.osgi.import>
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=1226850&r1=1226849&r2=1226850&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 Tue Jan 3 16:27:39 2012
@@ -81,7 +81,7 @@ public class PackageStateMBeanTest exten
PackageStateMBean packagaState = getMBean(PackageStateMBean.OBJECTNAME, PackageStateMBean.class);
assertNotNull(packagaState);
- long[] exportingBundles = packagaState.getExportingBundles("org.osgi.jmx.framework", "1.5.0");
+ long[] exportingBundles = packagaState.getExportingBundles("org.osgi.jmx.framework", "1.7.0");
assertNotNull(exportingBundles);
assertTrue("Should find a bundle exporting org.osgi.jmx.framework", exportingBundles.length > 0);
@@ -89,7 +89,7 @@ public class PackageStateMBeanTest exten
assertNull("Shouldn't find a bundle exporting test package", exportingBundles2);
long[] importingBundlesId = packagaState
- .getImportingBundles("org.osgi.jmx.framework", "1.5.0", exportingBundles[0]);
+ .getImportingBundles("org.osgi.jmx.framework", "1.7.0", exportingBundles[0]);
assertTrue("Should find bundles importing org.osgi.jmx.framework", importingBundlesId.length > 0);
TabularData table = packagaState.listPackages();
@@ -99,7 +99,7 @@ public class PackageStateMBeanTest exten
assertNotNull("Collection of CompositeData shouldn't be null", colData);
assertFalse("Collection of CompositeData should contain elements", colData.isEmpty());
- boolean isRemovalPending = packagaState.isRemovalPending("org.osgi.jmx.framework", "1.5.0", exportingBundles[0]);
+ boolean isRemovalPending = packagaState.isRemovalPending("org.osgi.jmx.framework", "1.7.0", exportingBundles[0]);
assertFalse("Should removal pending on org.osgi.jmx.framework be false", isRemovalPending);
}