Author: davidb
Date: Fri Dec 2 19:46:33 2011
New Revision: 1209655
URL: http://svn.apache.org/viewvc?rev=1209655&view=rev
Log:
Refactoring part 2 move BundleRevisionStateMBean to
org.osgi.jmx.framework.wiring package
Added:
aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/
aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleRevisionsStateMBean.java
(contents, props changed)
- copied, changed from r1209567,
aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/BundleRevisionsStateMBean.java
Modified:
aries/trunk/sandbox/jmx-next/jmx-api/pom.xml
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleWiringData.java
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleRevisionsState.java
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleRevisionsStateMBeanHandler.java
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleRevisionsStateMBeanTest.java
Modified: aries/trunk/sandbox/jmx-next/jmx-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-api/pom.xml?rev=1209655&r1=1209654&r2=1209655&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/jmx-api/pom.xml (original)
+++ aries/trunk/sandbox/jmx-next/jmx-api/pom.xml Fri Dec 2 19:46:33 2011
@@ -43,6 +43,7 @@
<aries.osgi.export.pkg>
org.osgi.jmx;uses:="javax.management.openmbean",
org.osgi.jmx.framework;uses:="org.osgi.jmx,javax.management.openmbean",
+
org.osgi.jmx.framework.wiring;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",
Copied:
aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleRevisionsStateMBean.java
(from r1209567,
aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/BundleRevisionsStateMBean.java)
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleRevisionsStateMBean.java?p2=aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleRevisionsStateMBean.java&p1=aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/BundleRevisionsStateMBean.java&r1=1209567&r2=1209655&rev=1209655&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/BundleRevisionsStateMBean.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleRevisionsStateMBean.java
Fri Dec 2 19:46:33 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.osgi.jmx.framework;
+package org.osgi.jmx.framework.wiring;
import java.io.IOException;
Propchange:
aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleRevisionsStateMBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleWiringData.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleWiringData.java?rev=1209655&r1=1209654&r2=1209655&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleWiringData.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/codec/BundleWiringData.java
Fri Dec 2 19:46:33 2011
@@ -32,7 +32,7 @@ import org.osgi.framework.wiring.BundleC
import org.osgi.framework.wiring.BundleRequirement;
import org.osgi.framework.wiring.BundleRevision;
import org.osgi.framework.wiring.BundleWire;
-import org.osgi.jmx.framework.BundleRevisionsStateMBean;
+import org.osgi.jmx.framework.wiring.BundleRevisionsStateMBean;
public class BundleWiringData {
private final long bundleId;
Modified:
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleRevisionsState.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleRevisionsState.java?rev=1209655&r1=1209654&r2=1209655&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleRevisionsState.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleRevisionsState.java
Fri Dec 2 19:46:33 2011
@@ -37,7 +37,7 @@ import org.osgi.framework.wiring.BundleR
import org.osgi.framework.wiring.BundleRevision;
import org.osgi.framework.wiring.BundleWire;
import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.jmx.framework.BundleRevisionsStateMBean;
+import org.osgi.jmx.framework.wiring.BundleRevisionsStateMBean;
public class BundleRevisionsState implements BundleRevisionsStateMBean {
private final BundleContext bundleContext;
Modified:
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleRevisionsStateMBeanHandler.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleRevisionsStateMBeanHandler.java?rev=1209655&r1=1209654&r2=1209655&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleRevisionsStateMBeanHandler.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleRevisionsStateMBeanHandler.java
Fri Dec 2 19:46:33 2011
@@ -23,7 +23,7 @@ import org.apache.aries.jmx.Logger;
import org.apache.aries.jmx.MBeanHandler;
import org.apache.aries.jmx.util.shared.RegistrableStandardEmitterMBean;
import org.osgi.framework.BundleContext;
-import org.osgi.jmx.framework.BundleRevisionsStateMBean;
+import org.osgi.jmx.framework.wiring.BundleRevisionsStateMBean;
import org.osgi.service.log.LogService;
public class BundleRevisionsStateMBeanHandler implements MBeanHandler {
Modified:
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleRevisionsStateMBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleRevisionsStateMBeanTest.java?rev=1209655&r1=1209654&r2=1209655&view=diff
==============================================================================
---
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleRevisionsStateMBeanTest.java
(original)
+++
aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/BundleRevisionsStateMBeanTest.java
Fri Dec 2 19:46:33 2011
@@ -51,8 +51,8 @@ import org.osgi.framework.wiring.BundleR
import org.osgi.framework.wiring.BundleRevision;
import org.osgi.framework.wiring.BundleWire;
import org.osgi.framework.wiring.BundleWiring;
-import org.osgi.jmx.framework.BundleRevisionsStateMBean;
import org.osgi.jmx.framework.PackageStateMBean;
+import org.osgi.jmx.framework.wiring.BundleRevisionsStateMBean;
public class BundleRevisionsStateMBeanTest extends AbstractIntegrationTest {
@Configuration
