You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/01/09 01:04:04 UTC

svn commit: r494268 - in /incubator/tuscany/java/sca: ./ runtime/standalone/ runtime/standalone/jmx-host/ runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/ runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/...

Author: meerajk
Date: Mon Jan  8 16:04:01 2007
New Revision: 494268

URL: http://svn.apache.org/viewvc?view=rev&rev=494268
Log:
removed jmx host

Added:
    incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java
      - copied, changed from r494159, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/JmxException.java
    incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java
      - copied, changed from r494239, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/JmxManagementService.java
    incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/
    incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java
      - copied, changed from r494159, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/AnnotationDrivenDynamicMBean.java
    incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java
      - copied, changed from r494159, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/InstrumentationException.java
    incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java
      - copied, changed from r494159, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/InstrumentedComponent.java
    incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java
      - copied, changed from r494159, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/ReflectedDynamicMBean.java
Removed:
    incubator/tuscany/java/sca/runtime/standalone/jmx-host/LICENSE.txt
    incubator/tuscany/java/sca/runtime/standalone/jmx-host/NOTICE.txt
    incubator/tuscany/java/sca/runtime/standalone/jmx-host/pom.xml
    incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/JmxHostException.java
    incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/JmxRuntimeImpl.java
    incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/JmxException.java
    incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/JmxManagementService.java
    incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/AnnotationDrivenDynamicMBean.java
    incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/InstrumentationException.java
    incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/InstrumentedComponent.java
    incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/ReflectedDynamicMBean.java
Modified:
    incubator/tuscany/java/sca/pom.xml
    incubator/tuscany/java/sca/runtime/standalone/pom.xml
    incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml
    incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java
    incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java

Modified: incubator/tuscany/java/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?view=diff&rev=494268&r1=494267&r2=494268
==============================================================================
--- incubator/tuscany/java/sca/pom.xml (original)
+++ incubator/tuscany/java/sca/pom.xml Mon Jan  8 16:04:01 2007
@@ -215,6 +215,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>2.1</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.tuscany</groupId>
@@ -245,6 +246,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
+                    <version>2.1</version>
                     <configuration>
                         <rulesets>
                             <ruleset>${basedir}/.ruleset</ruleset>

Modified: incubator/tuscany/java/sca/runtime/standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/pom.xml?view=diff&rev=494268&r1=494267&r2=494268
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/pom.xml Mon Jan  8 16:04:01 2007
@@ -35,7 +35,6 @@
         <module>standalone-api</module>
         <module>launcher</module>
         <module>standalone-host</module>
-        <module>jmx-host</module>
         <module>server.start</module>
         <module>server.shutdown</module>
         <module>plugin.standalone</module>

Modified: incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml?view=diff&rev=494268&r1=494267&r2=494268
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml Mon Jan  8 16:04:01 2007
@@ -44,8 +44,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
-            <artifactId>jmx-host</artifactId>
+            <groupId>org.apache.tuscany.sca.services.management</groupId>
+            <artifactId>management-jmx</artifactId>
             <version>${sca.version}</version>
             <scope>compile</scope>
         </dependency>

Modified: incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java?view=diff&rev=494268&r1=494267&r2=494268
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/server.start/src/main/java/org/apache/tuscany/standalone/server/TuscanyServer.java Mon Jan  8 16:04:01 2007
@@ -35,7 +35,7 @@
 import org.apache.tuscany.runtime.standalone.DirectoryHelper;
 import org.apache.tuscany.runtime.standalone.StandaloneRuntimeInfo;
 import org.apache.tuscany.runtime.standalone.StandaloneRuntimeInfoImpl;
-import org.apache.tuscany.runtime.standalone.jmx.management.JmxManagementService;
+import org.apache.tuscany.service.management.jmx.JmxManagementService;
 import org.apache.tuscany.standalone.server.management.jmx.Agent;
 import org.apache.tuscany.standalone.server.management.jmx.RmiAgent;
 
@@ -217,7 +217,7 @@
 
         final String className =
             runtimeInfo.getProperty("tuscany.launcherClass",
-                               "org.apache.tuscany.runtime.standalone.jmx.JmxRuntimeImpl");
+                               "org.apache.tuscany.runtime.standalone.host.StandaloneRuntimeImpl");
         final TuscanyRuntime runtime = (TuscanyRuntime) Beans.instantiate(bootClassLoader, className);
         runtime.setMonitorFactory(runtime.createDefaultMonitorFactory());
         runtime.setSystemScdl(systemScdl);

Modified: incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java?view=diff&rev=494268&r1=494267&r2=494268
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeImpl.java Mon Jan  8 16:04:01 2007
@@ -62,7 +62,7 @@
 
         XMLInputFactory xmlFactory = XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", bootClassLoader);
 
-        TuscanyManagementService managementService = null;
+        TuscanyManagementService managementService = (TuscanyManagementService)getManagementService();
         Bootstrapper bootstrapper = new DefaultBootstrapper(mf, xmlFactory, managementService);
         runtime = bootstrapper.createRuntime();
         runtime.start();

Copied: incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java (from r494159, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/JmxException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java?view=diff&rev=494268&p1=incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/JmxException.java&r1=494159&p2=incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java&r2=494268
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/JmxException.java (original)
+++ incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxException.java Mon Jan  8 16:04:01 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.runtime.standalone.jmx.management;
+package org.apache.tuscany.service.management.jmx;
 
 import org.apache.tuscany.api.TuscanyRuntimeException;
 

Copied: incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java (from r494239, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/JmxManagementService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java?view=diff&rev=494268&p1=incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/JmxManagementService.java&r1=494239&p2=incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java&r2=494268
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/JmxManagementService.java (original)
+++ incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/JmxManagementService.java Mon Jan  8 16:04:01 2007
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.runtime.standalone.jmx.management;
+package org.apache.tuscany.service.management.jmx;
 
 import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.apache.tuscany.runtime.standalone.jmx.management.instrument.InstrumentedComponent;
+import org.apache.tuscany.service.management.jmx.instrument.InstrumentedComponent;
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.services.management.TuscanyManagementService;
 

Copied: incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java (from r494159, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/AnnotationDrivenDynamicMBean.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java?view=diff&rev=494268&p1=incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/AnnotationDrivenDynamicMBean.java&r1=494159&p2=incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java&r2=494268
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/AnnotationDrivenDynamicMBean.java (original)
+++ incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/AnnotationDrivenDynamicMBean.java Mon Jan  8 16:04:01 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.runtime.standalone.jmx.management.instrument;
+package org.apache.tuscany.service.management.jmx.instrument;
 
 import javax.management.Attribute;
 import javax.management.AttributeList;

Copied: incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java (from r494159, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/InstrumentationException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java?view=diff&rev=494268&p1=incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/InstrumentationException.java&r1=494159&p2=incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java&r2=494268
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/InstrumentationException.java (original)
+++ incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentationException.java Mon Jan  8 16:04:01 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.runtime.standalone.jmx.management.instrument;
+package org.apache.tuscany.service.management.jmx.instrument;
 
 import org.apache.tuscany.api.TuscanyRuntimeException;
 

Copied: incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java (from r494159, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/InstrumentedComponent.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java?view=diff&rev=494268&p1=incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/InstrumentedComponent.java&r1=494159&p2=incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java&r2=494268
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/InstrumentedComponent.java (original)
+++ incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/InstrumentedComponent.java Mon Jan  8 16:04:01 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.runtime.standalone.jmx.management.instrument;
+package org.apache.tuscany.service.management.jmx.instrument;
 
 import java.util.Map;
 import javax.management.Attribute;

Copied: incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java (from r494159, incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/ReflectedDynamicMBean.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java?view=diff&rev=494268&p1=incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/ReflectedDynamicMBean.java&r1=494159&p2=incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java&r2=494268
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/jmx-host/src/main/java/org/apache/tuscany/runtime/standalone/jmx/management/instrument/ReflectedDynamicMBean.java (original)
+++ incubator/tuscany/java/sca/services/management/jmx/src/main/java/org/apache/tuscany/service/management/jmx/instrument/ReflectedDynamicMBean.java Mon Jan  8 16:04:01 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.    
  */
-package org.apache.tuscany.runtime.standalone.jmx.management.instrument;
+package org.apache.tuscany.service.management.jmx.instrument;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org