Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835141 13f79535-47bb-0310-9956-ffa450edef68

14 files changed, 0 insertions, 1387 deletions

diff --git a/branches/pre-spec-changes/services/management/jmx/LICENSE.txt b/branches/pre-spec-changes/services/management/jmx/LICENSE.txt
deleted file mode 100644
index 0084319535..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, serviceDefinition marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/branches/pre-spec-changes/services/management/jmx/NOTICE.txt b/branches/pre-spec-changes/services/management/jmx/NOTICE.txt
deleted file mode 100644
index d83ebbe236..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2006 The Apache Software Foundation
-
-Apache Tuscany is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/pre-spec-changes/services/management/jmx/pom.xml b/branches/pre-spec-changes/services/management/jmx/pom.xml
deleted file mode 100644
index ef6a4313b3..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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>
-
-    <parent>
-        <groupId>org.apache.tuscany.sca.services.management</groupId>
-        <artifactId>parent</artifactId>
-        <version>0.1-pre-spec-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>management-jmx</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany JMX Management</name>
-    <description>Apache Tuscany JMX Management</description>
-
-    <dependencies>    
-        <dependency>
-            <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>tuscany-spi</artifactId>
-            <version>${sca.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java b/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java
deleted file mode 100644
index 5b50affdf2..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.    
- */
-package org.apache.tuscany.service.management.jmx;
-
-import org.apache.tuscany.api.TuscanyRuntimeException;
-
-/**
- * Maps JMX exceptions to runtime exceptions.
- * 
- * @version $Revision$ $Date$
- */
-@SuppressWarnings("serial")
-public class JmxException extends TuscanyRuntimeException {
-
-    /**
-     * Initializes the root cause.
-     * @param cause Initializes the root cause.
-     */
-    public JmxException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java b/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java
deleted file mode 100644
index 2905a50c54..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.    
- */
-package org.apache.tuscany.service.management.jmx;
-
-import javax.management.JMException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.apache.tuscany.service.management.jmx.instrument.InstrumentedComponent;
-import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.services.management.TuscanyManagementService;
-
-/**
- * JMX implementation of the management service.
- *
- * @version $Revision$ $Date$
- */
-public class JmxManagementService implements TuscanyManagementService {
-
-    /**
-     * MBean server used by the JMX management service.
-     */
-    private final MBeanServer mBeanServer;
-
-    /**
-     * Management domain used by the runtime.
-     */
-    private final String managementDomain;
-
-
-    /**
-     * Constructor that initializes the MBeanServer and domain to use for registering components.
-     *
-     * @param mBeanServer the MBeanServer components should be registered with
-     * @param managementDomain the JMX domain to use when generating ObjectNames
-     */
-    public JmxManagementService(MBeanServer mBeanServer, String managementDomain) {
-        this.mBeanServer = mBeanServer;
-        this.managementDomain = managementDomain;
-    }
-
-    /**
-     * @throws JmxException In case of an unexpected JMX exception.
-     * @see org.apache.tuscany.spi.services.management.TuscanyManagementService#registerComponent(
-     *java.lang.String,org.apache.tuscany.spi.component.Component)
-     */
-    public final void registerComponent(String name, Component component) throws JmxException {
-
-        try {            
-            ObjectName on = new ObjectName(managementDomain + ":" + "type=component,name=" + name);
-            InstrumentedComponent mbean = new InstrumentedComponent(component);
-            mBeanServer.registerMBean(mbean, on);
-        } catch (JMException ex) {
-            throw new JmxException(ex);
-        }
-
-    }
-}
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java b/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java
deleted file mode 100644
index 0172b15d8c..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/AbstractAgent.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * 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.    
- */
-package org.apache.tuscany.service.management.jmx.agent;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnectorServer;
-import javax.management.remote.JMXConnectorServerFactory;
-import javax.management.remote.JMXServiceURL;
-
-/**
- * Abstract super class for all the agents.
- * @version $Revison$ $Date$
- *
- */
-public abstract class AbstractAgent implements Agent {
-
-    /** Root domain */
-    private static final String DOMAIN = "tuscany";
-
-    /** MBean server to use. */
-    private MBeanServer mBeanServer;
-    
-    /** Start flag. */
-    private AtomicBoolean started = new AtomicBoolean();
-    
-    /** RMI connector adaptor. */
-    private JMXConnectorServer connectorServer;
-
-    /**
-     * Initialies the server.
-     * @throws ManagementException If unable to start the agent.
-     */
-    protected AbstractAgent() throws ManagementException {        
-        mBeanServer = MBeanServerFactory.createMBeanServer(DOMAIN);        
-    }
-    
-    /**
-     * @see org.apache.tuscany.service.management.jmx.agent.Agent#getMBeanServer()
-     */
-    public MBeanServer getMBeanServer() {
-        return mBeanServer;
-    }
-
-    /**
-     * @see org.apache.tuscany.service.management.jmx.agent.Agent#register(java.lang.Object, java.lang.String)
-     */
-    public final void register(Object instance, String name) throws ManagementException {
-        
-        try {
-            mBeanServer.registerMBean(instance, new ObjectName(name));
-        } catch (Exception ex) {
-            throw new ManagementException(ex);
-        }
-        
-    }
-
-    /**
-     * @see org.apache.tuscany.service.management.jmx.agent.Agent#start()
-     */
-    public final void start() throws ManagementException {
-
-        try {
-            
-            if(started.get()) {
-                throw new IllegalArgumentException("Agent already started");
-            }
-            
-            preStart();
-            
-            JMXServiceURL url = getAdaptorUrl();
-            connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, null, mBeanServer);
-            
-            connectorServer.start();
-            
-            started.set(true);
-            
-        } catch (MalformedURLException ex) {
-            throw new ManagementException(ex);
-        } catch (IOException ex) {
-            throw new ManagementException(ex);
-        }
-
-    }
-
-    /**
-     * @see org.apache.tuscany.service.management.jmx.agent.Agent#shutdown()
-     */
-    public final void shutdown() throws ManagementException {
-        
-        try {
-            
-            if(!started.get()) {
-                throw new IllegalArgumentException("Agent not started");
-            }
-            
-            connectorServer.stop();
-            postStop();
-            started.set(false);
-            
-        } catch (IOException ex) {
-            throw new ManagementException(ex);
-        }
-        
-    }
-    
-    /**
-     * Gets the underlying MBean server.
-     * @return A reference to the mbean server.
-     */
-    protected MBeanServer getMbeanServer() {
-        return mBeanServer;
-    }
-    
-    /**
-     * Gets the adaptor URL.
-     * @return Adaptor URL.
-     */
-    protected abstract JMXServiceURL getAdaptorUrl();
-    
-    /**
-     * Any initialiation required for protocol specific agent.
-     *
-     */
-    protected abstract void preStart();
-    
-    /**
-     * Any initialiation required for protocol specific agent.
-     *
-     */
-    protected abstract void postStop();
-
-}
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java b/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java
deleted file mode 100644
index 30727e21bf..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/Agent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.    
- */
-package org.apache.tuscany.service.management.jmx.agent;
-
-import javax.management.MBeanServer;
-
-/**
- * Interface to a JMX agent.
- * @version $Revision$ $Date$
- *
- */
-public interface Agent {
-
-    /**
-     * Registers a managed bean.
-     * @param instance Instance to be registered.
-     * @param name Object name of the instance.
-     * @throws ManagementException If unable to register the object.
-     */
-    void register(Object instance, String name) throws ManagementException;
-
-    /**
-     * Starts the JMX server.
-     * @throws ManagementException If unable to start the server.
-     */
-    void start() throws ManagementException;
-
-    /**
-     * Shuts down the JMX server.
-     * @throws ManagementException If unable to shutdown the server.
-     */
-    void shutdown() throws ManagementException;
-    
-    /**
-     * Gets the MBean server used by the agent.
-     * @return MBean server used by the agent.
-     */
-    MBeanServer getMBeanServer();
-
-}
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java b/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java
deleted file mode 100644
index 6ff8c14ac6..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/ManagementException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.    
- */
-package org.apache.tuscany.service.management.jmx.agent;
-
-import org.apache.tuscany.api.TuscanyRuntimeException;
-
-/**
- * @version $Revision$ $Date$
- *
- */
-@SuppressWarnings("serial")
-public class ManagementException extends TuscanyRuntimeException {
-
-    /**
-     * Initializes the root cause.
-     * @param th Root cause.
-     */
-    public ManagementException(Throwable th) {
-        super(th);
-    }
-}
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java b/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java
deleted file mode 100644
index 593f6fec90..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/agent/RmiAgent.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.    
- */
-package org.apache.tuscany.service.management.jmx.agent;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.rmi.server.UnicastRemoteObject;
-
-import javax.management.remote.JMXServiceURL;
-
-/**
- * Utility for starting the JMX server with an RMI agent.
- * 
- * @version $Revsion$ $Date$
- *
- */
-public class RmiAgent extends AbstractAgent {
-
-    /** Administration port system property. */
-    private static final String ADMIN_PORT_PROPERTY = "tuscany.adminPort";
-
-    /** Default admin port. */
-    private static final int DEFAULT_ADMIN_PORT = 1099;
-
-    /** Instance */
-    private static final Agent INSTANCE = new RmiAgent();
-    
-    /** RMI registry. */
-    private Registry registry;
-    
-    /** Listen port */
-    private int port = DEFAULT_ADMIN_PORT;
-
-    /**
-     * Gets the adaptor URL.
-     * @return Adaptor URL used by the agent.
-     * @throws ManagementException If unable to start the agent.
-     */
-    protected JMXServiceURL getAdaptorUrl() throws ManagementException {
-        
-        try {
-            
-            String portValue = System.getProperty(ADMIN_PORT_PROPERTY);
-            if(portValue != null) {
-                port = Integer.parseInt(portValue);
-            }
-            
-            // service:jmx:rmi:///jndi/rmi://localhost:1099/server
-            return new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + port + "/server");
-            
-            
-        } catch (MalformedURLException ex) {
-            throw new ManagementException(ex);
-        }
-        
-    }
-
-    /**
-     * Returns the singleton agent instance.
-     * @return Agent instance.
-     * @throws ManagementException If unable to start the agent.
-     */
-    public static Agent getInstance() throws ManagementException {
-        return INSTANCE;
-    }
-
-    /**
-     * @see org.apache.tuscany.service.management.jmx.agent.AbstractAgent#preStart()
-     */
-    @Override
-    public void preStart() throws ManagementException {
-
-        try {
-            registry = LocateRegistry.createRegistry(port);
-        } catch (RemoteException ex) {
-            throw new ManagementException(ex);
-        }
-
-    }
-
-    /**
-     * @see org.apache.tuscany.service.management.jmx.agent.AbstractAgent#postStop()
-     */
-    @Override
-    public void postStop() throws ManagementException {
-        
-        try {
-            UnicastRemoteObject.unexportObject(registry, true);            
-        } catch (IOException ex) {
-            throw new ManagementException(ex);
-        }
-        
-    }
-
-}
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java b/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java
deleted file mode 100644
index 3d16ff6a2a..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.    
- */
-package org.apache.tuscany.service.management.jmx.instrument;
-
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.AttributeNotFoundException;
-import javax.management.DynamicMBean;
-import javax.management.InvalidAttributeValueException;
-import javax.management.MBeanException;
-import javax.management.MBeanInfo;
-import javax.management.ReflectionException;
-
-/**
- * Dynamic MBean based on management annotations.
- *
- * @version $Revision$ $Date$
- */
-public class AnnotationDrivenDynamicMBean implements DynamicMBean {
-
-    /**
-     * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-     */
-    public Object getAttribute(String attribute)
-        throws AttributeNotFoundException, MBeanException, ReflectionException {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-     */
-    public AttributeList getAttributes(String[] attributes) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#getMBeanInfo()
-     */
-    public MBeanInfo getMBeanInfo() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#invoke(java.lang.String,java.lang.Object[],java.lang.String[])
-     */
-    public Object invoke(String actionName, Object[] params, String[] signature) throws MBeanException,
-                                                                                        ReflectionException {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-     */
-    public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException,
-                                                         MBeanException, ReflectionException {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-     */
-    public AttributeList setAttributes(AttributeList attributes) {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java b/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java
deleted file mode 100644
index a8ad1666d5..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.    
- */
-package org.apache.tuscany.service.management.jmx.instrument;
-
-import org.apache.tuscany.api.TuscanyRuntimeException;
-
-/**
- * Excpetion thrown when there is an instrumentation error.
- * 
- * @version $Revison$ $Date$
- *
- */
-@SuppressWarnings("serial")
-public class InstrumentationException extends TuscanyRuntimeException {
-
-    /**
-     * Initializes the root cause.
-     * @param cause Initializes the root cause.
-     */
-    public InstrumentationException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Initializes the message.
-     * @param message Initializes the message.
-     */
-    public InstrumentationException(String message) {
-        super(message);
-    }
-
-}
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java b/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java
deleted file mode 100644
index 1ef33c8bc9..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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.    
- */
-package org.apache.tuscany.service.management.jmx.instrument;
-
-import java.util.Map;
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.AttributeNotFoundException;
-import javax.management.DynamicMBean;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanConstructorInfo;
-import javax.management.MBeanInfo;
-import javax.management.MBeanNotificationInfo;
-import javax.management.MBeanOperationInfo;
-
-import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.model.PropertyValue;
-
-/**
- * This is Ruscany component exposed as a dynamic MBean. Currently it only supports a read-only vew of all the
- * properties on the component.
- *
- * @version $Revision$ $Date$
- */
-public class InstrumentedComponent implements DynamicMBean {
-
-    /**
-     * Properties available on the component.
-     */
-    private final Map<String, PropertyValue<?>> properties;
-
-    /**
-     * Name of the component.
-     */
-    private String componentName;
-
-    /**
-     * Initializes the property values.
-     *
-     * @param component Component that is being managed.
-     */
-    @SuppressWarnings("unchecked")
-    public InstrumentedComponent(final Component component) {
-        this.properties = component.getDefaultPropertyValues();
-        this.componentName = component.getName();
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-     */
-    public final Object getAttribute(final String attribute) throws AttributeNotFoundException {
-        PropertyValue<?> propertyValue = properties.get(attribute);
-        if (propertyValue != null) {
-            return propertyValue.getValueFactory().getInstance();
-        }
-        throw new AttributeNotFoundException(attribute + " not found.");
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-     */
-    public final AttributeList getAttributes(final String[] attributes) {
-
-        AttributeList list = new AttributeList();
-        for (String attribute : attributes) {
-            try {
-                list.add(new Attribute(attribute, getAttribute(attribute)));
-            } catch (AttributeNotFoundException ex) {
-                throw new InstrumentationException(ex);
-            }
-        }
-        return list;
-
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#getMBeanInfo()
-     */
-    public final MBeanInfo getMBeanInfo() {
-
-        final MBeanConstructorInfo[] constructors = null;
-        final MBeanOperationInfo[] operations = null;
-        final MBeanNotificationInfo[] notifications = null;
-
-        final MBeanAttributeInfo[] attributes = new MBeanAttributeInfo[properties.size()];
-
-        int i = 0;
-        for (PropertyValue<?> propertyValue : properties.values()) {
-            attributes[i++] =
-                new MBeanAttributeInfo(propertyValue.getName(), String.class.getName(), null, true, false, false);
-        }
-
-        return new MBeanInfo(componentName, null, attributes, constructors, operations, notifications);
-
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#invoke(java.lang.String,java.lang.Object[],java.lang.String[])
-     */
-    public final Object invoke(final String actionName, final Object[] params, final String[] signature) {
-        throw new UnsupportedOperationException("Managed ops not supported");
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-     */
-    public final void setAttribute(final Attribute attribute) {
-        throw new UnsupportedOperationException("Mutable props not supported");
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-     */
-    public final AttributeList setAttributes(final AttributeList attributes) {
-        throw new UnsupportedOperationException("Mutable props not supported");
-    }
-
-}
diff --git a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java b/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java
deleted file mode 100644
index b07787208c..0000000000
--- a/branches/pre-spec-changes/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * 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.    
- */
-package org.apache.tuscany.service.management.jmx.instrument;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.MethodDescriptor;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.management.Attribute;
-import javax.management.AttributeList;
-import javax.management.AttributeNotFoundException;
-import javax.management.DynamicMBean;
-import javax.management.InvalidAttributeValueException;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.ReflectionException;
-
-/**
- * Uses JMX dynamic MBean to expose management information of a delegate instance using reflection. Currently
- * constructor and notification metadata are not supported. Any attribute or operation that needs to be excluded from
- * the management information can be specified optionally in the factory method.
- * <p/>
- * All the methods and properties on <code>java.lang.Object</code> are excluded by default. Also only public and
- * non-static members are made available for management.
- * <p/>
- * TODO Find a homw other than server.start for this class. TODO Tidy up, unit tests
- *
- * @version $Revsion$ $Date$
- */
-public class ReflectedDynamicMBean implements DynamicMBean {
-
-    /**
-     * Excluded methods.
-     */
-    private static final List<String> DEFAULT_EXCLUDED_METHODS =
-        Arrays.asList(new String[]{"wait", "toString", "hashCode", "notify", "equals", "notifyAll", "getClass"});
-
-    /**
-     * Excluded properties.
-     */
-    private static final List<String> DEFAULT_EXCLUDED_PROPERTIES = Arrays.asList(new String[]{"class"});
-
-    /**
-     * Proxied object that is managed.
-     */
-    private Object delegate;
-
-    /**
-     * Runtime type of the managed object.
-     */
-    private Class delegateClass;
-
-    /**
-     * Delegate class name.
-     */
-    private String delegateClassName;
-
-    /**
-     * Cache of property write methods.
-     */
-    private Map<String, Method> propertyWriteMethods = new HashMap<String, Method>();
-
-    /**
-     * Cache of property read methods.
-     */
-    private Map<String, Method> propertyReadMethods = new HashMap<String, Method>();
-
-    /**
-     * Managed operation cache.
-     */
-    private Map<String, Method> methods = new HashMap<String, Method>();
-
-    /**
-     * Property descriptor cache.
-     */
-    private Map<String, PropertyDescriptor> properties = new HashMap<String, PropertyDescriptor>();
-
-    /**
-     * Excluded methods.
-     */
-    private final List<String> excludedMethods = new ArrayList<String>();
-
-    /**
-     * Excluded properties.
-     */
-    private final List<String> excludedProperties = new ArrayList<String>();
-
-    /**
-     * Introspects the bean and populate meta information.
-     *
-     * @param delegate Proxied managed instance.
-     */
-    private ReflectedDynamicMBean(Object delegate) {
-        this(delegate, new ArrayList<String>(), new ArrayList<String>());
-    }
-
-    /**
-     * Introspects the bean and populate meta information.
-     *
-     * @param delegate           Proxied managed instance.
-     * @param excludedMethods    Operations excluded from managed view.
-     * @param excludedProperties Properties excluded from managed view.
-     */
-    private ReflectedDynamicMBean(Object delegate, List<String> excludedMethods, List<String> excludedProperties) {
-
-        this.delegate = delegate;
-        this.delegateClass = delegate.getClass();
-        this.delegateClassName = delegateClass.getName();
-
-        this.excludedMethods.addAll(excludedMethods);
-        this.excludedMethods.addAll(DEFAULT_EXCLUDED_METHODS);
-        this.excludedProperties.addAll(excludedProperties);
-        this.excludedProperties.addAll(DEFAULT_EXCLUDED_PROPERTIES);
-
-        BeanInfo beanInfo;
-        try {
-            beanInfo = Introspector.getBeanInfo(delegateClass);
-        } catch (IntrospectionException ex) {
-            throw new InstrumentationException(ex);
-        }
-
-        cacheProperties(beanInfo);
-
-        cacheMethods(beanInfo);
-    }
-
-    /**
-     * Factory method for creating the management view.
-     *
-     * @param delegate           Proxied managed instance.
-     * @param excludedMethods    Operations excluded from managed view.
-     * @param excludedProperties Properties excluded from managed view.
-     * @return Proxy for the managed instance.
-     */
-    public static ReflectedDynamicMBean newInstance(Object delegate, List<String> excludedMethods,
-                                                    List<String> excludedProperties) {
-        return new ReflectedDynamicMBean(delegate, excludedMethods, excludedProperties);
-    }
-
-    /**
-     * Factory method for creating the management view.
-     *
-     * @param delegate Proxied managed instance.
-     * @return Proxy for the managed instance.
-     */
-    public static ReflectedDynamicMBean newInstance(Object delegate) {
-        return new ReflectedDynamicMBean(delegate);
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#getAttribute(java.lang.String)
-     */
-    public Object getAttribute(String attribute)
-        throws AttributeNotFoundException, MBeanException, ReflectionException {
-
-        Method readMethod = propertyReadMethods.get(attribute);
-        if (readMethod == null) {
-            throw new AttributeNotFoundException(attribute + " not found");
-        }
-        try {
-            return readMethod.invoke(delegate);
-        } catch (IllegalAccessException ex) {
-            throw new ReflectionException(ex);
-        } catch (InvocationTargetException ex) {
-            throw new ReflectionException(ex);
-        }
-
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#getAttributes(java.lang.String[])
-     */
-    public AttributeList getAttributes(String[] attributes) {
-
-        AttributeList list = new AttributeList();
-        for (String attribute : attributes) {
-            try {
-                list.add(new Attribute(attribute, getAttribute(attribute)));
-            } catch (AttributeNotFoundException ex) {
-                throw new InstrumentationException(ex);
-            } catch (MBeanException ex) {
-                throw new InstrumentationException(ex);
-            } catch (ReflectionException ex) {
-                throw new InstrumentationException(ex);
-            }
-        }
-        return list;
-
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#getMBeanInfo()
-     */
-    public MBeanInfo getMBeanInfo() {
-
-        try {
-
-            MBeanAttributeInfo[] attrs = new MBeanAttributeInfo[properties.keySet().size()];
-            int count = 0;
-            for (String property : properties.keySet()) {
-                Method readMethod = propertyReadMethods.get(property);
-                Method writeMethod = propertyWriteMethods.get(property);
-                attrs[count++] = new MBeanAttributeInfo(property, "", readMethod, writeMethod);
-            }
-
-            MBeanOperationInfo[] ops = new MBeanOperationInfo[methods.keySet().size()];
-            count = 0;
-            for (Method method : methods.values()) {
-                ops[count++] = new MBeanOperationInfo("", method);
-            }
-
-            MBeanInfo mBeanInfo = new MBeanInfo(delegateClassName, "", attrs, null, ops, null);
-            return mBeanInfo;
-
-        } catch (javax.management.IntrospectionException ex) {
-            throw new InstrumentationException(ex);
-        }
-
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#invoke(java.lang.String,java.lang.Object[],java.lang.String[])
-     */
-    public Object invoke(String actionName, Object[] params, String[] signature) throws MBeanException,
-                                                                                        ReflectionException {
-
-        Method method = methods.get(actionName);
-        if (method == null) {
-            throw new InstrumentationException("Operation not found: " + actionName);
-        }
-        try {
-            return method.invoke(delegate, params);
-        } catch (IllegalAccessException ex) {
-            throw new ReflectionException(ex);
-        } catch (InvocationTargetException ex) {
-            throw new ReflectionException(ex);
-        }
-
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#setAttribute(javax.management.Attribute)
-     */
-    public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException,
-                                                         MBeanException, ReflectionException {
-
-        Method writeMethod = propertyWriteMethods.get(attribute.getName());
-        if (writeMethod == null) {
-            throw new AttributeNotFoundException(attribute + " not found");
-        }
-        try {
-            writeMethod.invoke(delegate, attribute.getValue());
-        } catch (IllegalAccessException ex) {
-            throw new ReflectionException(ex);
-        } catch (InvocationTargetException ex) {
-            throw new ReflectionException(ex);
-        }
-
-    }
-
-    /**
-     * @see javax.management.DynamicMBean#setAttributes(javax.management.AttributeList)
-     */
-    public AttributeList setAttributes(AttributeList attributes) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Caches managed operations.
-     *
-     * @param beanInfo Bean info for the managed instance.
-     */
-    private void cacheMethods(BeanInfo beanInfo) {
-
-        for (MethodDescriptor methodDescriptor : beanInfo.getMethodDescriptors()) {
-
-            Method method = methodDescriptor.getMethod();
-            String name = method.getName();
-
-            if (excludedMethods.contains(name)) {
-                continue;
-            }
-            int modifiers = method.getModifiers();
-            if (!Modifier.isPublic(modifiers) || Modifier.isStatic(modifiers)) {
-                continue;
-            }
-            if (propertyReadMethods.values().contains(method) || propertyWriteMethods.values().contains(method)) {
-                continue;
-            }
-
-            // TODO Add support for overloaded methods
-            methods.put(name, method);
-
-        }
-
-    }
-
-    /**
-     * Caches managed properties.
-     *
-     * @param beanInfo Bean info for the managed instance.
-     */
-    private void cacheProperties(BeanInfo beanInfo) {
-        for (PropertyDescriptor propertyDescriptor : beanInfo.getPropertyDescriptors()) {
-
-            String name = propertyDescriptor.getName();
-
-            if (excludedProperties.contains(name)) {
-                continue;
-            }
-            properties.put(name, propertyDescriptor);
-
-            Method readMethod = propertyDescriptor.getReadMethod();
-            if (readMethod != null && Modifier.isPublic(readMethod.getModifiers())) {
-                propertyReadMethods.put(name, readMethod);
-            }
-
-            Method writeMethod = propertyDescriptor.getWriteMethod();
-            if (writeMethod != null && Modifier.isPublic(writeMethod.getModifiers())) {
-                propertyWriteMethods.put(name, writeMethod);
-            }
-
-        }
-    }
-
-}
diff --git a/branches/pre-spec-changes/services/management/pom.xml b/branches/pre-spec-changes/services/management/pom.xml
deleted file mode 100644
index d652189c7e..0000000000
--- a/branches/pre-spec-changes/services/management/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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>
-    <parent>
-        <groupId>org.apache.tuscany.sca.services</groupId>
-        <artifactId>parent</artifactId>
-        <version>0.1-pre-spec-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.tuscany.sca.services.management</groupId>
-    <artifactId>parent</artifactId>
-    <packaging>pom</packaging>
-    <name>Tuscany SCA Management Services</name>
-
-    <modules>
-        <module>jmx</module>
-    </modules>
-</project>