incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r894019 - in /incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint: BlueprintMetadataMBean.java JmxConstants.java
Date Sat, 26 Dec 2009 20:07:40 GMT
Author: gawor
Date: Sat Dec 26 20:07:40 2009
New Revision: 894019

URL: http://svn.apache.org/viewvc?rev=894019&view=rev
Log:
ARIES-92: update mbean definition to work fine on java 5 and other minor cleanup

Modified:
    incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
    incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java

Modified: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/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?rev=894019&r1=894018&r2=894019&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
(original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
Sat Dec 26 20:07:40 2009
@@ -340,7 +340,7 @@
     Item            VALUES_ITEM             = new Item(
                                                     VALUES,
                                                     "All the values",
-                                                    Item.arrayType(1, JmxConstants.BYTE_ARRAY_TYPE));
+                                                    Item.arrayType(2, SimpleType.BYTE));
     
 
     /**

Modified: incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/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?rev=894019&r1=894018&r2=894019&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
(original)
+++ incubator/aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
Sat Dec 26 20:07:40 2009
@@ -1,24 +1,4 @@
 /*
- * Copyright (c) OSGi Alliance (2009). All Rights Reserved.
- * 
- * Licensed 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.
- */
-
-package org.apache.aries.jmx.blueprint;
-
-import javax.management.openmbean.ArrayType;
-import javax.management.openmbean.SimpleType;
-/*
  * 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
@@ -37,6 +17,11 @@
  * under the License.
  */
 
+package org.apache.aries.jmx.blueprint;
+
+import javax.management.openmbean.ArrayType;
+import javax.management.openmbean.SimpleType;
+
 /**
  * Constants.
  * 
@@ -55,13 +40,7 @@
         // empty
     }
 
-    /**
-     * The MBean Open type for an array of longs
-     */
-    //For the compatibility  with java 5, we missed the efficient way.
-    /*public static final ArrayType<?>    PRIMITIVE_BYTE_ARRAY_TYPE   = Item
-                                                                    .primitiveArrayType(
-                                                                            SimpleType.BYTE);*/
+
     public static final ArrayType/*<Byte>*/    BYTE_ARRAY_TYPE   = Item
                                                                     .arrayType(
                                                                             1,
@@ -74,13 +53,7 @@
                                                                     .arrayType(
                                                                             1,
                                                                             SimpleType.STRING);
-    /**
-     * The MBean Open type for an array of longs
-     */
-    public static final ArrayType/*<Long>*/    LONG_ARRAY_TYPE     = Item
-                                                                    .arrayType(
-                                                                            1,
-                                                                            SimpleType.LONG);
+
 
     /**
      * The domain name of the Blueprint MBeans



Mime
View raw message