You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ga...@apache.org on 2009/12/24 00:16:03 UTC
svn commit: r893648 [1/2] - in /incubator/aries/trunk/jmx: ./
jmx-blueprint-api/ jmx-blueprint-api/src/ jmx-blueprint-api/src/main/
jmx-blueprint-api/src/main/java/ jmx-blueprint-api/src/main/java/org/
jmx-blueprint-api/src/main/java/org/apache/ jmx-bl...
Author: gawor
Date: Wed Dec 23 23:16:00 2009
New Revision: 893648
URL: http://svn.apache.org/viewvc?rev=893648&view=rev
Log:
ARIES-92: Contribute Blueprint MBeans from Geronimo
Added:
incubator/aries/trunk/jmx/jmx-blueprint-api/
incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml (with props)
incubator/aries/trunk/jmx/jmx-blueprint-api/src/
incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/
incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/
incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/
incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/
incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/
incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/
incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/
incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java (contents, props changed)
- copied, changed from r893592, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintMetadataMBean.java
incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java (contents, props changed)
- copied, changed from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintStateMBean.java
incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java (contents, props changed)
- copied, changed from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/Item.java
incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java (contents, props changed)
- copied, changed from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/JmxConstants.java
incubator/aries/trunk/jmx/jmx-blueprint-core/
incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml (with props)
incubator/aries/trunk/jmx/jmx-blueprint-core/src/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java (contents, props changed)
- copied, changed from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/Activator.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java (contents, props changed)
- copied, changed from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java (contents, props changed)
- copied, changed from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintState.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java (contents, props changed)
- copied, changed from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/RegistrationStandardMBean.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/ (props changed)
- copied from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/codec/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/
incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java (contents, props changed)
- copied, changed from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/test/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintMetadataTest.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java (contents, props changed)
- copied, changed from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/test/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintStateTest.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java (contents, props changed)
- copied, changed from r893592, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/BlueprintMBeanTest.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ (props changed)
- copied from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.test/src/test/java/org/apache/geronimo/blueprint/jmx/test/framework/
Modified:
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanArgument.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanProperty.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPCollectionMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPComponentMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPIdRefMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMapEntry.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMapMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPNonNullMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPNullMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPPropsMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPRefMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceListMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceListener.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPRegistrationListener.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPServiceMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPServiceReferenceMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPTarget.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPValueMetadata.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/OSGiBlueprintEvent.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/TransferObject.java
incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/Util.java
incubator/aries/trunk/jmx/jmx-itests/pom.xml
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractArgumentPropertyValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractCompositeDataValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractListenerComponentValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/AbstractServiceReferenceValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanArgumentValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanPropertyValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BeanValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/BlueprintEventValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/CollectionValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/MapEntryValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/NonNullObjectValueValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ObjectValueValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/RefValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceListValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceListenerValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ReferenceValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/RegistrationListenerValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ServiceValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/TargetValidator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Util.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/Validator.java
incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ValueValidator.java
incubator/aries/trunk/jmx/pom.xml
Added: incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml?rev=893648&view=auto
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml (added)
+++ incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml Wed Dec 23 23:16:00 2009
@@ -0,0 +1,51 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>jmx</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>aries-jmx-blueprint-api</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Aries JMX Blueprint API</name>
+ <description>
+ This bundle contains the JMX Blueprint API
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.groupId}.api</Bundle-SymbolicName>
+ <Export-Package>
+ org.apache.aries.jmx.blueprint
+ </Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-api/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java (from r893592, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintMetadataMBean.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java?p2=incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java&p1=geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintMetadataMBean.java&r1=893592&r2=893648&rev=893648&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintMetadataMBean.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java Wed Dec 23 23:16:00 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx;
+package org.apache.aries.jmx.blueprint;
import java.io.IOException;
@@ -32,7 +32,7 @@
/**
* The object name for this MBean.
*/
- String OBJECTNAME = JmxConstants.GERONIMO_BLUEPRINT+":service=blueprintMetadata,version=1.0";
+ String OBJECTNAME = JmxConstants.ARIES_BLUEPRINT+":service=blueprintMetadata,version=1.0";
///////////////////////////////////////////////////////////////
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java (from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintStateMBean.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java?p2=incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java&p1=geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintStateMBean.java&r1=893591&r2=893648&rev=893648&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/BlueprintStateMBean.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java Wed Dec 23 23:16:00 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx;
+package org.apache.aries.jmx.blueprint;
import java.io.IOException;
@@ -36,7 +36,7 @@
/**
* The object name for this MBean.
*/
- String OBJECTNAME = JmxConstants.GERONIMO_BLUEPRINT+":service=blueprintState,version=1.0";
+ String OBJECTNAME = JmxConstants.ARIES_BLUEPRINT+":service=blueprintState,version=1.0";
///////////////////////////////////////////////////////////////
// Define Event's CompositeType
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java (from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/Item.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java?p2=incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java&p1=geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/Item.java&r1=893591&r2=893648&rev=893648&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/Item.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java Wed Dec 23 23:16:00 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx;
+package org.apache.aries.jmx.blueprint;
import java.util.Arrays;
import java.util.LinkedHashSet;
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java (from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/JmxConstants.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java?p2=incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java&p1=geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/JmxConstants.java&r1=893591&r2=893648&rev=893648&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx/src/main/java/org/apache/geronimo/blueprint/jmx/JmxConstants.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java Wed Dec 23 23:16:00 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.geronimo.blueprint.jmx;
+package org.apache.aries.jmx.blueprint;
import javax.management.openmbean.ArrayType;
import javax.management.openmbean.SimpleType;
@@ -85,5 +85,5 @@
/**
* The domain name of the Blueprint MBeans
*/
- public static final String GERONIMO_BLUEPRINT = "org.apache.geronimo.blueprint";
+ public static final String ARIES_BLUEPRINT = "org.apache.aries.blueprint";
}
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
------------------------------------------------------------------------------
svn:mergeinfo =
Added: incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml?rev=893648&view=auto
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml (added)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml Wed Dec 23 23:16:00 2009
@@ -0,0 +1,90 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>jmx</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>aries-jmx-blueprint-core</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Aries JMX Blueprint Core</name>
+ <description>
+ This bundle contains the core implementation of the JMX Blueprint API
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-blueprint-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-legacy</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.groupId}.core</Bundle-SymbolicName>
+ <Bundle-Activator>org.apache.aries.jmx.blueprint.impl.Activator</Bundle-Activator>
+ <Export-Package>
+ org.apache.aries.jmx.blueprint.impl.codec*;version=${project.version}
+ </Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java (from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/Activator.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java?p2=incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java&p1=geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/Activator.java&r1=893591&r2=893648&rev=893648&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/Activator.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl;
+package org.apache.aries.jmx.blueprint.impl;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -30,8 +30,8 @@
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
-import org.apache.geronimo.blueprint.jmx.BlueprintStateMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintStateMBean;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java (from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintMetadata.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java?p2=incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java&p1=geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintMetadata.java&r1=893591&r2=893648&rev=893648&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl;
+package org.apache.aries.jmx.blueprint.impl;
import java.io.IOException;
import java.util.Collection;
import javax.management.openmbean.CompositeData;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
-import org.apache.geronimo.blueprint.jmx.impl.codec.BPMetadata;
-import org.apache.geronimo.blueprint.jmx.impl.codec.Util;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.impl.codec.BPMetadata;
+import org.apache.aries.jmx.blueprint.impl.codec.Util;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -48,7 +48,7 @@
/*
* (non-Javadoc)
*
- * @see org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean#getBlueprintContainerServiceId(long)
+ * @see org.apache.aries.jmx.blueprint.BlueprintMetadataMBean#getBlueprintContainerServiceId(long)
*/
public long getBlueprintContainerServiceId(long bundleId) throws IOException {
Bundle bpBundle = bundleContext.getBundle(bundleId);
@@ -95,7 +95,7 @@
*
* type could be Bean, Service, serviceReference (non-Javadoc)
*
- * @see org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean#getComponentIdsByType(long, java.lang.String)
+ * @see org.apache.aries.jmx.blueprint.BlueprintMetadataMBean#getComponentIdsByType(long, java.lang.String)
*/
public String[] getComponentIdsByType(long containerServiceId, String type) {
BlueprintContainer container = getBlueprintContainer(containerServiceId);
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java (from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintState.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java?p2=incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java&p1=geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintState.java&r1=893591&r2=893648&rev=893648&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintState.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl;
+package org.apache.aries.jmx.blueprint.impl;
import java.io.IOException;
import java.util.HashMap;
@@ -29,8 +29,8 @@
import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
-import org.apache.geronimo.blueprint.jmx.BlueprintStateMBean;
-import org.apache.geronimo.blueprint.jmx.impl.codec.OSGiBlueprintEvent;
+import org.apache.aries.jmx.blueprint.BlueprintStateMBean;
+import org.apache.aries.jmx.blueprint.impl.codec.OSGiBlueprintEvent;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.blueprint.container.BlueprintEvent;
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java (from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/RegistrationStandardMBean.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java?p2=incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java&p1=geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/RegistrationStandardMBean.java&r1=893591&r2=893648&rev=893648&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/main/java/org/apache/geronimo/blueprint/jmx/impl/RegistrationStandardMBean.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl;
+package org.apache.aries.jmx.blueprint.impl;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanArgument.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanArgument.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanArgument.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanArgument.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.BeanArgument;
public class BPBeanArgument implements TransferObject {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.Map;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.BeanArgument;
import org.osgi.service.blueprint.reflect.BeanMetadata;
import org.osgi.service.blueprint.reflect.BeanProperty;
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanProperty.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanProperty.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanProperty.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPBeanProperty.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.BeanProperty;
public class BPBeanProperty implements TransferObject {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPCollectionMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPCollectionMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPCollectionMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPCollectionMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.CollectionMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPComponentMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPComponentMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPComponentMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPComponentMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
import java.util.Map;
import javax.management.openmbean.CompositeData;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
public abstract class BPComponentMetadata implements BPNonNullMetadata {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPIdRefMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPIdRefMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPIdRefMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPIdRefMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.IdRefMetadata;
public class BPIdRefMetadata implements BPNonNullMetadata {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMapEntry.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMapEntry.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMapEntry.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMapEntry.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.MapEntry;
public class BPMapEntry implements TransferObject {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMapMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMapMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMapMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMapMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.MapEntry;
import org.osgi.service.blueprint.reflect.MapMetadata;
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
public interface BPMetadata extends TransferObject{
// marker interface
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPNonNullMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPNonNullMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPNonNullMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPNonNullMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
public interface BPNonNullMetadata extends BPMetadata {
// marker interface
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPNullMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPNullMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPNullMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPNullMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.NullMetadata;
public class BPNullMetadata implements BPMetadata {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPPropsMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPPropsMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPPropsMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPPropsMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.MapEntry;
import org.osgi.service.blueprint.reflect.PropsMetadata;
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPRefMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPRefMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPRefMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPRefMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.RefMetadata;
public class BPRefMetadata implements BPNonNullMetadata, BPTarget {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceListMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceListMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceListMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceListMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.Map;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.ReferenceListMetadata;
public class BPReferenceListMetadata extends BPServiceReferenceMetadata {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceListener.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceListener.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceListener.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceListener.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.ReferenceListener;
public class BPReferenceListener implements TransferObject {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPReferenceMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.Map;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.ReferenceMetadata;
public class BPReferenceMetadata extends BPServiceReferenceMetadata implements BPTarget {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPRegistrationListener.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPRegistrationListener.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPRegistrationListener.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPRegistrationListener.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.RegistrationListener;
public class BPRegistrationListener implements TransferObject {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPServiceMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPServiceMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPServiceMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPServiceMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.Map;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.MapEntry;
import org.osgi.service.blueprint.reflect.RegistrationListener;
import org.osgi.service.blueprint.reflect.ServiceMetadata;
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPServiceReferenceMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPServiceReferenceMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPServiceReferenceMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPServiceReferenceMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.Map;
import javax.management.openmbean.CompositeData;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.ReferenceListener;
import org.osgi.service.blueprint.reflect.ServiceReferenceMetadata;
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPTarget.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPTarget.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPTarget.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPTarget.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
public interface BPTarget extends BPNonNullMetadata{
// marker interface
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPValueMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPValueMetadata.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPValueMetadata.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/BPValueMetadata.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.ValueMetadata;
public class BPValueMetadata implements BPNonNullMetadata {
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/OSGiBlueprintEvent.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/OSGiBlueprintEvent.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/OSGiBlueprintEvent.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/OSGiBlueprintEvent.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.util.HashMap;
import java.util.Map;
@@ -25,7 +25,7 @@
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.OpenDataException;
-import org.apache.geronimo.blueprint.jmx.BlueprintStateMBean;
+import org.apache.aries.jmx.blueprint.BlueprintStateMBean;
import org.osgi.service.blueprint.container.BlueprintEvent;
/**
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/TransferObject.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/TransferObject.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/TransferObject.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/TransferObject.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import javax.management.openmbean.CompositeData;
Modified: incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/Util.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/Util.java?rev=893648&r1=893591&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/Util.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/Util.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl.codec;
+package org.apache.aries.jmx.blueprint.impl.codec;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -26,7 +26,7 @@
import javax.management.openmbean.CompositeData;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.osgi.service.blueprint.reflect.BeanMetadata;
import org.osgi.service.blueprint.reflect.CollectionMetadata;
import org.osgi.service.blueprint.reflect.IdRefMetadata;
Copied: incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java (from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/test/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintMetadataTest.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java?p2=incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java&p1=geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/test/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintMetadataTest.java&r1=893591&r2=893648&rev=893648&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/test/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintMetadataTest.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java Wed Dec 23 23:16:00 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl;
+package org.apache.aries.jmx.blueprint.impl;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -30,7 +30,7 @@
import java.util.List;
import java.util.Set;
-import org.apache.geronimo.blueprint.jmx.BlueprintMetadataMBean;
+import org.apache.aries.jmx.blueprint.BlueprintMetadataMBean;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java (from r893591, geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/test/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintStateTest.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java?p2=incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java&p1=geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/test/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintStateTest.java&r1=893591&r2=893648&rev=893648&view=diff
==============================================================================
--- geronimo/sandbox/rex/org.apache.geronimo.blueprint.jmx.impl/src/test/java/org/apache/geronimo/blueprint/jmx/impl/BlueprintStateTest.java (original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java Wed Dec 23 23:16:00 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.blueprint.jmx.impl;
+package org.apache.aries.jmx.blueprint.impl;
-import org.apache.geronimo.blueprint.jmx.BlueprintStateMBean;
+import org.apache.aries.jmx.blueprint.BlueprintStateMBean;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
Propchange: incubator/aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/aries/trunk/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/pom.xml?rev=893648&r1=893647&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-itests/pom.xml (original)
+++ incubator/aries/trunk/jmx/jmx-itests/pom.xml Wed Dec 23 23:16:00 2009
@@ -51,6 +51,16 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-blueprint-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>aries-jmx-blueprint-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
@@ -60,12 +70,34 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
- <!--<dependency>
- <groupId>org.apache.aries.jmx</groupId>
- <artifactId>aries-jmx</artifactId>
- <scope>provided</scope>
- </dependency>
- -->
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.sample</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>aries-blueprint</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
@@ -96,6 +128,21 @@
<build>
<plugins>
+
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>generate-depends-file</id>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Modified: incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java?rev=893648&r1=893647&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java (original)
+++ incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java Wed Dec 23 23:16:00 2009
@@ -53,15 +53,6 @@
@Inject
protected BundleContext bundleContext;
- @Configuration
- public static Option[] configure()
- {
- return options(
- CoreOptions.equinox(),
- mavenConfiguration()
- );
- }
-
@Before
public void setUp() throws Exception {
mbeanServer = MBeanServerFactory.createMBeanServer();
Modified: incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java?rev=893648&r1=893647&r2=893648&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java (original)
+++ incubator/aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/framework/FrameworkMBeanTest.java Wed Dec 23 23:16:00 2009
@@ -26,6 +26,9 @@
import org.apache.aries.jmx.codec.BatchActionResult;
import org.junit.Assert;
import org.junit.Test;
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
import org.osgi.jmx.framework.FrameworkMBean;
/**
@@ -35,6 +38,14 @@
*/
public class FrameworkMBeanTest extends AbstractIntegrationTest {
+ @Configuration
+ public static Option[] configuration() {
+ return CoreOptions.options(CoreOptions.equinox(),
+ CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx-api").versionAsInProject(),
+ CoreOptions.mavenBundle().groupId("org.apache.aries.jmx").artifactId("aries-jmx-core").versionAsInProject()
+ );
+ }
+
@Test
public void testSetBundleStartLevels() throws IOException {
FrameworkMBean framework = getMBean(FrameworkMBean.OBJECTNAME, FrameworkMBean.class);