[jboss-cvs] JBossAS SVN: r90081 - projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-06-11 03:48:32 -0400 (Thu, 11 Jun 2009)
New Revision: 90081

Modified:
   projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/JBossBeanXMLMarshaller.java
   projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/MetaDataConverter.java
   projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/XMLMigrator.java
Log:
Minor fixes.
Todo on recursion.

Modified: projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/JBossBeanXMLMarshaller.java
===================================================================
--- projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/JBossBeanXMLMarshaller.java	2009-06-11 07:01:22 UTC (rev 90080)
+++ projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/JBossBeanXMLMarshaller.java	2009-06-11 07:48:32 UTC (rev 90081)
@@ -55,6 +55,7 @@
       result.append("\n\n</deployment>");
       return result.toString();
    }
+   
    /**
     * @param bean
     * @param result
@@ -106,6 +107,7 @@
                result.append("/>");
                result.append("\n").append(tab).append(tab);
             }
+            // TODO - recursion?
             else if(value instanceof BeanMetaData)
             {
                BeanMetaData anonymousBean = (BeanMetaData) value;

Modified: projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/MetaDataConverter.java
===================================================================
--- projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/MetaDataConverter.java	2009-06-11 07:01:22 UTC (rev 90080)
+++ projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/MetaDataConverter.java	2009-06-11 07:48:32 UTC (rev 90081)
@@ -125,7 +125,7 @@
       // update xMBean*Found variables
       xMBeanDescriptorFound = xMBeanDescriptorFound || service.getXMBeanDescriptor() != null;
       xMBeanDDFound = xMBeanDDFound || service.getXMBeanDD() != null;
-      xMBeanCodeFound = xMBeanCodeFound || service.getXMBeanCode() != ServiceMetaData.XMBEAN_CODE;
+      xMBeanCodeFound = xMBeanCodeFound || ServiceMetaData.XMBEAN_CODE.equals(service.getXMBeanCode()) == false;
       
       // create bean metadata and set its class and name properties
       AbstractBeanMetaData beanMetaData = new AbstractBeanMetaData(service.getCode());
@@ -207,13 +207,13 @@
       {
          ServiceInjectionValueMetaData valueMetaData = (ServiceInjectionValueMetaData) value;
          String dependency = (String) valueMetaData.getDependency();
-         String property = (String) valueMetaData.getProperty();
+         String property = valueMetaData.getProperty();
          newValue = new AbstractInjectionValueMetaData(nameTranslator.translate(dependency), property);
       }
       else if (value instanceof ServiceDependencyValueMetaData)
       {
          ServiceDependencyValueMetaData valueMetaData = (ServiceDependencyValueMetaData) value;
-         String dependency = (String) valueMetaData.getDependency();
+         String dependency = valueMetaData.getDependency();
          newValue = new AbstractInjectionValueMetaData(nameTranslator.translate(dependency));
       }
       else if (value instanceof ServiceValueFactoryValueMetaData)

Modified: projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/XMLMigrator.java
===================================================================
--- projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/XMLMigrator.java	2009-06-11 07:01:22 UTC (rev 90080)
+++ projects/mc-tools/trunk/src/main/java/org/jboss/mc/tools/jmx/XMLMigrator.java	2009-06-11 07:48:32 UTC (rev 90081)
@@ -118,8 +118,14 @@
          File xmlFile = getOutputFile(arg);
          System.out.println("Migrating " + arg + " to " + xmlFile.getAbsoluteFile());
          PrintWriter printWriter = new PrintWriter(xmlFile);
-         printWriter.print(xmlContent);
-         printWriter.close();
+         try
+         {
+            printWriter.print(xmlContent);
+         }
+         finally
+         {
+            printWriter.close();
+         }
       }
       if (metaDataConverter.isXMBeanCodeFound())
       {