ARIES-254: The JMX blueprint bundle should not export the .impl.codec…

… package but .codec package instead git-svn-id: https://svn.apache.org/repos/asf/incubator/aries/trunk/jmx@923710 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 16, 2010 · 13b3049 · 13b3049
1 parent 47bf01c
commit 13b3049
Show file tree

Hide file tree

Showing 29 changed files with 49 additions and 48 deletions.
diff --git a/jmx-blueprint-bundle/pom.xml b/jmx-blueprint-bundle/pom.xml
@@ -71,7 +71,8 @@
                             *
                         </Import-Package>
                         <Export-Package>
-                            org.apache.aries.jmx.blueprint
+                            org.apache.aries.jmx.blueprint;version="${pom.version}",
+                            org.apache.aries.jmx.blueprint.codec;version="${pom.version}"
                         </Export-Package>
                         <Private-Package>
                             org.apache.aries.jmx.blueprint.impl*

diff --git a/jmx-blueprint-core/pom.xml b/jmx-blueprint-core/pom.xml
@@ -81,7 +81,7 @@
                         <Bundle-SymbolicName>${pom.artifactId}</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} 
+                            org.apache.aries.jmx.blueprint.codec*;version=${project.version} 
                         </Export-Package>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                         <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>

diff --git a/.../blueprint/impl/codec/BPBeanArgument.java → ...s/jmx/blueprint/codec/BPBeanArgument.java b/.../blueprint/impl/codec/BPBeanArgument.java → ...s/jmx/blueprint/codec/BPBeanArgument.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 

diff --git a/.../blueprint/impl/codec/BPBeanMetadata.java → ...s/jmx/blueprint/codec/BPBeanMetadata.java b/.../blueprint/impl/codec/BPBeanMetadata.java → ...s/jmx/blueprint/codec/BPBeanMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.Map;
 

diff --git a/.../blueprint/impl/codec/BPBeanProperty.java → ...s/jmx/blueprint/codec/BPBeanProperty.java b/.../blueprint/impl/codec/BPBeanProperty.java → ...s/jmx/blueprint/codec/BPBeanProperty.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 

diff --git a/...rint/impl/codec/BPCollectionMetadata.java → ...blueprint/codec/BPCollectionMetadata.java b/...rint/impl/codec/BPCollectionMetadata.java → ...blueprint/codec/BPCollectionMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 

diff --git a/...print/impl/codec/BPComponentMetadata.java → .../blueprint/codec/BPComponentMetadata.java b/...print/impl/codec/BPComponentMetadata.java → .../blueprint/codec/BPComponentMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...blueprint/impl/codec/BPIdRefMetadata.java → .../jmx/blueprint/codec/BPIdRefMetadata.java b/...blueprint/impl/codec/BPIdRefMetadata.java → .../jmx/blueprint/codec/BPIdRefMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 

diff --git a/.../jmx/blueprint/impl/codec/BPMapEntry.java → ...aries/jmx/blueprint/codec/BPMapEntry.java b/.../jmx/blueprint/impl/codec/BPMapEntry.java → ...aries/jmx/blueprint/codec/BPMapEntry.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 

diff --git a/...x/blueprint/impl/codec/BPMapMetadata.java → ...es/jmx/blueprint/codec/BPMapMetadata.java b/...x/blueprint/impl/codec/BPMapMetadata.java → ...es/jmx/blueprint/codec/BPMapMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 

diff --git a/.../jmx/blueprint/impl/codec/BPMetadata.java → ...aries/jmx/blueprint/codec/BPMetadata.java b/.../jmx/blueprint/impl/codec/BPMetadata.java → ...aries/jmx/blueprint/codec/BPMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 public interface BPMetadata extends TransferObject{
     // marker interface

diff --git a/...ueprint/impl/codec/BPNonNullMetadata.java → ...mx/blueprint/codec/BPNonNullMetadata.java b/...ueprint/impl/codec/BPNonNullMetadata.java → ...mx/blueprint/codec/BPNonNullMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 public interface BPNonNullMetadata extends BPMetadata {
     // marker interface

diff --git a/.../blueprint/impl/codec/BPNullMetadata.java → ...s/jmx/blueprint/codec/BPNullMetadata.java b/.../blueprint/impl/codec/BPNullMetadata.java → ...s/jmx/blueprint/codec/BPNullMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.CompositeDataSupport;
@@ -27,11 +27,11 @@
 
 public class BPNullMetadata implements BPMetadata {
     public BPNullMetadata(CompositeData Null) {
-    	//do nothing ?
+        //do nothing ?
     }
 
     public BPNullMetadata(NullMetadata Null) {
-    	//do nothing ?
+        //do nothing ?
     }
 
     public CompositeData asCompositeData() {

diff --git a/...blueprint/impl/codec/BPPropsMetadata.java → .../jmx/blueprint/codec/BPPropsMetadata.java b/...blueprint/impl/codec/BPPropsMetadata.java → .../jmx/blueprint/codec/BPPropsMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 

diff --git a/...x/blueprint/impl/codec/BPRefMetadata.java → ...es/jmx/blueprint/codec/BPRefMetadata.java b/...x/blueprint/impl/codec/BPRefMetadata.java → ...es/jmx/blueprint/codec/BPRefMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 

diff --git a/...t/impl/codec/BPReferenceListMetadata.java → ...eprint/codec/BPReferenceListMetadata.java b/...t/impl/codec/BPReferenceListMetadata.java → ...eprint/codec/BPReferenceListMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.Map;
 

diff --git a/...print/impl/codec/BPReferenceListener.java → .../blueprint/codec/BPReferenceListener.java b/...print/impl/codec/BPReferenceListener.java → .../blueprint/codec/BPReferenceListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 

diff --git a/...print/impl/codec/BPReferenceMetadata.java → .../blueprint/codec/BPReferenceMetadata.java b/...print/impl/codec/BPReferenceMetadata.java → .../blueprint/codec/BPReferenceMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.Map;
 

diff --git a/...nt/impl/codec/BPRegistrationListener.java → ...ueprint/codec/BPRegistrationListener.java b/...nt/impl/codec/BPRegistrationListener.java → ...ueprint/codec/BPRegistrationListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 

diff --git a/...ueprint/impl/codec/BPServiceMetadata.java → ...mx/blueprint/codec/BPServiceMetadata.java b/...ueprint/impl/codec/BPServiceMetadata.java → ...mx/blueprint/codec/BPServiceMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.Map;
 

diff --git a/...mpl/codec/BPServiceReferenceMetadata.java → ...int/codec/BPServiceReferenceMetadata.java b/...mpl/codec/BPServiceReferenceMetadata.java → ...int/codec/BPServiceReferenceMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.Map;
 

diff --git a/...es/jmx/blueprint/impl/codec/BPTarget.java → ...e/aries/jmx/blueprint/codec/BPTarget.java b/...es/jmx/blueprint/impl/codec/BPTarget.java → ...e/aries/jmx/blueprint/codec/BPTarget.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 public interface BPTarget extends BPNonNullMetadata{
 	// marker interface

diff --git a/...blueprint/impl/codec/BPValueMetadata.java → .../jmx/blueprint/codec/BPValueMetadata.java b/...blueprint/impl/codec/BPValueMetadata.java → .../jmx/blueprint/codec/BPValueMetadata.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 

diff --git a/...eprint/impl/codec/OSGiBlueprintEvent.java → ...x/blueprint/codec/OSGiBlueprintEvent.java b/...eprint/impl/codec/OSGiBlueprintEvent.java → ...x/blueprint/codec/OSGiBlueprintEvent.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -70,25 +70,25 @@
  */
 
 public class OSGiBlueprintEvent implements TransferObject{
-    
+
     private long bundleId;
 
     private long extenderBundleId;
-    
+
     private int eventType;
-    
+
     private boolean replay;
-    
+
     private long timestamp;
-    
+
     private String[] dependencies;
 
     private String exceptionMessage;
-    
+
 
     /**
      * Construct an OSGiBlueprintEvent from the supplied <link>BlueprintEvent</link>
-     * 
+     *
      * @param event
      *            - the event to represent
      */
@@ -105,7 +105,7 @@ public OSGiBlueprintEvent(BlueprintEvent event) {
     /**
      * Construct an OSGiBlueprintEvent from the CompositeData representing the
      * event
-     * 
+     *
      * @param data
      *            - the CompositeData representing the event.
      */
@@ -122,7 +122,7 @@ public OSGiBlueprintEvent(CompositeData data) {
 
     /**
      * Construct the OSGiBlueprintEvent
-     * 
+     *
      * @param bundleId
      * @param extenderBundleId
      * @param eventType
@@ -140,10 +140,10 @@ public OSGiBlueprintEvent(long bundleId, long extenderBundleId, int eventType, b
         this.dependencies = dependencies;
         this.exceptionMessage = exceptionMessage;
     }
-    
+
     /**
      * Answer the receiver encoded as CompositeData
-     * 
+     *
      * @return the CompositeData encoding of the receiver.
      */
     @SuppressWarnings("boxing")
@@ -162,7 +162,7 @@ public CompositeData asCompositeData() {
             throw new IllegalStateException("Cannot form blueprint event open data", e);
         }
     }
-    
+
     public long getBundleId() {
         return bundleId;
     }

diff --git a/.../blueprint/impl/codec/TransferObject.java → ...s/jmx/blueprint/codec/TransferObject.java b/.../blueprint/impl/codec/TransferObject.java → ...s/jmx/blueprint/codec/TransferObject.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import javax.management.openmbean.CompositeData;
 

diff --git a/.../aries/jmx/blueprint/impl/codec/Util.java → ...pache/aries/jmx/blueprint/codec/Util.java b/.../aries/jmx/blueprint/impl/codec/Util.java → ...pache/aries/jmx/blueprint/codec/Util.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.jmx.blueprint.impl.codec;
+package org.apache.aries.jmx.blueprint.codec;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -87,7 +87,7 @@ public static BPMetadata metadata2BPMetadata(Metadata metadata) {
     public static BPMetadata binary2BPMetadata(byte[] buf) {
         if(null == buf)
             return null;
-        
+
         ByteArrayInputStream inBytes = new ByteArrayInputStream(buf);
         ObjectInputStream inObject;
         CompositeData metadata;
@@ -146,7 +146,7 @@ public static BPMetadata binary2BPMetadata(byte[] buf) {
     public static byte[] bpMetadata2Binary(BPMetadata metadata) {
         if(null == metadata)
             return null;
-        
+
         ByteArrayOutputStream outBytes = new ByteArrayOutputStream();
         ObjectOutputStream outObject;
         try {
@@ -163,7 +163,7 @@ public static Byte[] bpMetadata2BoxedBinary(BPMetadata metadata)
     {
         if(null == metadata)
             return null;
-        
+
         byte [] src = bpMetadata2Binary(metadata);
         Byte [] res = new Byte[src.length];
         for(int i=0;i<src.length;i++)
@@ -175,7 +175,7 @@ public static Byte[] bpMetadata2BoxedBinary(BPMetadata metadata)
     public static BPMetadata boxedBinary2BPMetadata(Byte[] buf) {
         if(null == buf)
             return null;
-        
+
         byte [] unbox = new byte[buf.length];
         for(int i=0;i<buf.length;i++)
         {

diff --git a/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java b/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
@@ -24,8 +24,8 @@
 import javax.management.openmbean.CompositeData;
 
 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.apache.aries.jmx.blueprint.codec.BPMetadata;
+import org.apache.aries.jmx.blueprint.codec.Util;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;

diff --git a/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java b/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
@@ -30,7 +30,7 @@
 import javax.management.openmbean.TabularDataSupport;
 
 import org.apache.aries.jmx.blueprint.BlueprintStateMBean;
-import org.apache.aries.jmx.blueprint.impl.codec.OSGiBlueprintEvent;
+import org.apache.aries.jmx.blueprint.codec.OSGiBlueprintEvent;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.blueprint.container.BlueprintEvent;

diff --git a/jmx-core/pom.xml b/jmx-core/pom.xml
@@ -80,7 +80,7 @@
 						</Import-Package>
                         <!-- Not currently exporting anything -->
                         <Export-Package>
-                            org.apache.aries.jmx.codec;;version=${project.version} 
+                            org.apache.aries.jmx.codec;version=${project.version} 
                         </Export-Package>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                         <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>