aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1409307 - in /aries/trunk: ./ jmx/ jmx/jmx-api/ jmx/jmx-blueprint-api/ jmx/jmx-blueprint-bundle/ jmx/jmx-blueprint-core/ jmx/jmx-bundle/ jmx/jmx-core-whiteboard/ jmx/jmx-core/ jmx/jmx-itests/ jmx/jmx-whiteboard/ jmx/tck/ sandbox/jmx-next/ ...
Date Wed, 14 Nov 2012 19:18:14 GMT
Author: davidb
Date: Wed Nov 14 19:18:12 2012
New Revision: 1409307

URL: http://svn.apache.org/viewvc?rev=1409307&view=rev
Log:
Move the updated JMX implementation from sandbox/jmx-next back to jmx.

The code being moved implements the Enterprise OSGi R5 JMX specification. This Aries subproject
is the Reference Implementation of the OSGi JMX 1.1 specification and as such passes all the
OSGi CT tests for JMX 1.1. It was originally copied (with history) from the Aries jmx codebase
to the sandbox to allow development to happen in parallel with maintenance to the previous
JMX implementation.

Changes to the main jmx codebase which were made in the mean time were also ported over:

r1363903 cumminsh [ARIES-862] Adding version ranges for jmx imports
r1365595 gnodet   [ARIES-884] ClassCastException in JMX when installing some bundles
r1366650 cumminsh [ARIES-862] Ensuring uber-bundles have correct package versions for transitive
dependencies by making them not transitive :)


Added:
    aries/trunk/jmx/LICENSE
      - copied unchanged from r1409299, aries/trunk/sandbox/jmx-next/LICENSE
    aries/trunk/jmx/NOTICE
      - copied unchanged from r1409299, aries/trunk/sandbox/jmx-next/NOTICE
    aries/trunk/jmx/jmx-api/
      - copied from r1409299, aries/trunk/sandbox/jmx-next/jmx-api/
    aries/trunk/jmx/jmx-blueprint-api/
      - copied from r1409299, aries/trunk/sandbox/jmx-next/jmx-blueprint-api/
    aries/trunk/jmx/jmx-blueprint-bundle/
      - copied from r1409299, aries/trunk/sandbox/jmx-next/jmx-blueprint-bundle/
    aries/trunk/jmx/jmx-blueprint-core/
      - copied from r1409299, aries/trunk/sandbox/jmx-next/jmx-blueprint-core/
    aries/trunk/jmx/jmx-bundle/
      - copied from r1409299, aries/trunk/sandbox/jmx-next/jmx-bundle/
    aries/trunk/jmx/jmx-core/
      - copied from r1409299, aries/trunk/sandbox/jmx-next/jmx-core/
    aries/trunk/jmx/jmx-core-whiteboard/
      - copied from r1409299, aries/trunk/sandbox/jmx-next/jmx-core-whiteboard/
    aries/trunk/jmx/jmx-itests/
      - copied from r1409299, aries/trunk/sandbox/jmx-next/jmx-itests/
    aries/trunk/jmx/jmx-whiteboard/
      - copied from r1409299, aries/trunk/sandbox/jmx-next/jmx-whiteboard/
    aries/trunk/jmx/pom.xml
      - copied, changed from r1409299, aries/trunk/sandbox/jmx-next/pom.xml
    aries/trunk/jmx/tck/
      - copied from r1409299, aries/trunk/sandbox/jmx-next/tck/
Removed:
    aries/trunk/sandbox/jmx-next/LICENSE
    aries/trunk/sandbox/jmx-next/NOTICE
    aries/trunk/sandbox/jmx-next/jmx-api/
    aries/trunk/sandbox/jmx-next/jmx-blueprint-api/
    aries/trunk/sandbox/jmx-next/jmx-blueprint-bundle/
    aries/trunk/sandbox/jmx-next/jmx-blueprint-core/
    aries/trunk/sandbox/jmx-next/jmx-bundle/
    aries/trunk/sandbox/jmx-next/jmx-core/
    aries/trunk/sandbox/jmx-next/jmx-core-whiteboard/
    aries/trunk/sandbox/jmx-next/jmx-itests/
    aries/trunk/sandbox/jmx-next/jmx-whiteboard/
    aries/trunk/sandbox/jmx-next/pom.xml
    aries/trunk/sandbox/jmx-next/tck/
Modified:
    aries/trunk/jmx/jmx-api/pom.xml
    aries/trunk/pom.xml

Modified: aries/trunk/jmx/jmx-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/pom.xml?rev=1409307&r1=1409299&r2=1409307&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/pom.xml (original)
+++ aries/trunk/jmx/jmx-api/pom.xml Wed Nov 14 19:18:12 2012
@@ -29,7 +29,7 @@
     <name>Apache Aries JMX API</name>
     <version>1.1.0-SNAPSHOT</version>
     <description>
-        This bundle contains the JMX 1.0.0 API
+        This bundle contains the JMX 1.1.0 API
     </description>
 
      <scm>

Copied: aries/trunk/jmx/pom.xml (from r1409299, aries/trunk/sandbox/jmx-next/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/pom.xml?p2=aries/trunk/jmx/pom.xml&p1=aries/trunk/sandbox/jmx-next/pom.xml&r1=1409299&r2=1409307&rev=1409307&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/pom.xml (original)
+++ aries/trunk/jmx/pom.xml Wed Nov 14 19:18:12 2012
@@ -30,6 +30,7 @@
     <artifactId>jmx</artifactId>
     <name>Apache Aries JMX</name>
     <packaging>pom</packaging>
+    <version>1.1.0-SNAPSHOT</version>
 
 
     <description>Implementation of the JMX Management Model Specification - reactor
pom</description>

Modified: aries/trunk/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/pom.xml?rev=1409307&r1=1409306&r2=1409307&view=diff
==============================================================================
--- aries/trunk/pom.xml (original)
+++ aries/trunk/pom.xml Wed Nov 14 19:18:12 2012
@@ -50,9 +50,7 @@
         <module>application</module>
         <module>subsystem</module>
         <module>ejb</module>
-        <!-- temporarily disable JMX while replacing the old JMX implementation with the
new one
         <module>jmx</module>
-        -->
         <module>jpa</module>
         <module>spi-fly</module>
         <module>samples</module>



Mime
View raw message