[jboss-cvs] JBossAS SVN: r75672 - trunk/connector/src/main/org/jboss/resource/metadata.

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

Author: alesj
Date: 2008-07-11 05:26:07 -0400 (Fri, 11 Jul 2008)
New Revision: 75672

Modified:
   trunk/connector/src/main/org/jboss/resource/metadata/ConfigPropertyMetaDataContainer.java
   trunk/connector/src/main/org/jboss/resource/metadata/DependsMetaData.java
   trunk/connector/src/main/org/jboss/resource/metadata/JBossRAMetaData.java
   trunk/connector/src/main/org/jboss/resource/metadata/MessageListenerMetaData.java
   trunk/connector/src/main/org/jboss/resource/metadata/RARDeploymentMetaData.java
Log:
Making RARDeploymentMetaData serializble.


Modified: trunk/connector/src/main/org/jboss/resource/metadata/ConfigPropertyMetaDataContainer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/ConfigPropertyMetaDataContainer.java	2008-07-11 08:51:39 UTC (rev 75671)
+++ trunk/connector/src/main/org/jboss/resource/metadata/ConfigPropertyMetaDataContainer.java	2008-07-11 09:26:07 UTC (rev 75672)
@@ -24,7 +24,7 @@
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
+import java.util.Set;
 
 /**
  * An abstract class for meta data that have config properties
@@ -37,7 +37,7 @@
    static final long serialVersionUID = 2891949219806920844L;
    
    /** The properties by name */
-   private HashSet properties = new HashSet();
+   private Set<ConfigPropertyMetaData> properties = new HashSet<ConfigPropertyMetaData>();
    
    /**
     * Add a property
@@ -67,9 +67,8 @@
     */
    public ConfigPropertyMetaData getProperty(String name)
    {
-      for (Iterator i = properties.iterator(); i.hasNext();)
+      for (ConfigPropertyMetaData cpmd : properties)
       {
-         ConfigPropertyMetaData cpmd = (ConfigPropertyMetaData) i.next();
          if (cpmd.getName().equals(name))
             return cpmd;
       }

Modified: trunk/connector/src/main/org/jboss/resource/metadata/DependsMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/DependsMetaData.java	2008-07-11 08:51:39 UTC (rev 75671)
+++ trunk/connector/src/main/org/jboss/resource/metadata/DependsMetaData.java	2008-07-11 09:26:07 UTC (rev 75672)
@@ -31,11 +31,9 @@
  */
 public class DependsMetaData implements Serializable
 {
-
    /** The dependsName */
    private String dependsName;
    
-   
    /**
     * Get the dependsName
     * 
@@ -61,7 +59,7 @@
       StringBuffer buffer = new StringBuffer();
       buffer.append("DescriptionMetaData").append('@');
       buffer.append(Integer.toHexString(System.identityHashCode(this)));
-      buffer.append("[dependsName=").append(dependsName);      
+      buffer.append("[dependsName=").append(dependsName).append(']');      
       return buffer.toString();
    }
 }

Modified: trunk/connector/src/main/org/jboss/resource/metadata/JBossRAMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/JBossRAMetaData.java	2008-07-11 08:51:39 UTC (rev 75671)
+++ trunk/connector/src/main/org/jboss/resource/metadata/JBossRAMetaData.java	2008-07-11 09:26:07 UTC (rev 75672)
@@ -21,9 +21,10 @@
  */
 package org.jboss.resource.metadata;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import org.jboss.util.collection.CollectionsFactory;
+
 /**
  * A JBossRAMetaData.
  * 
@@ -33,18 +34,17 @@
  */
 public class JBossRAMetaData extends ConfigPropertyMetaDataContainer
 {
-
    /** The serialVersionUID */
    private static final long serialVersionUID = -8041048198795930659L;
    
-   private ArrayList<DependsMetaData> dependsNameList = new ArrayList<DependsMetaData>();
+   private List<DependsMetaData> dependsNameList = CollectionsFactory.createLazyList();
    
    public void addDependsMetaData(DependsMetaData dmd)
    {
 	   dependsNameList.add(dmd);
    }
    
-   public List getDependsMetaData()
+   public List<DependsMetaData> getDependsMetaData()
    {
 	   return dependsNameList;
    }   

Modified: trunk/connector/src/main/org/jboss/resource/metadata/MessageListenerMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/MessageListenerMetaData.java	2008-07-11 08:51:39 UTC (rev 75671)
+++ trunk/connector/src/main/org/jboss/resource/metadata/MessageListenerMetaData.java	2008-07-11 09:26:07 UTC (rev 75672)
@@ -24,6 +24,7 @@
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Message listener meta data
@@ -42,7 +43,7 @@
    private String asType;
    
    /** The required properties */
-   private HashSet requiredProperties = new HashSet();
+   private Set<RequiredConfigPropertyMetaData> requiredProperties = new HashSet<RequiredConfigPropertyMetaData>();
 
    /**
     * Get the message listener type
@@ -99,7 +100,7 @@
     * 
     * @return the required config properties
     */
-   public Collection getRequiredConfigProperties()
+   public Collection<RequiredConfigPropertyMetaData> getRequiredConfigProperties()
    {
       return requiredProperties;
    }

Modified: trunk/connector/src/main/org/jboss/resource/metadata/RARDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/RARDeploymentMetaData.java	2008-07-11 08:51:39 UTC (rev 75671)
+++ trunk/connector/src/main/org/jboss/resource/metadata/RARDeploymentMetaData.java	2008-07-11 09:26:07 UTC (rev 75672)
@@ -21,33 +21,39 @@
  */
 package org.jboss.resource.metadata;
 
+import java.io.Serializable;
 
+
 /**
  * A RARDeploymentMetaData.
  * 
  * @author <a href="weston.price at jboss.com">Weston Price</a>
  * @version $Revision$
  */
-public class RARDeploymentMetaData
+public class RARDeploymentMetaData implements Serializable
 {
+   private static final long serialVersionUID = 5812689890896027289L;
+
    private ConnectorMetaData connectorMetaData = new ConnectorMetaData();
    private JBossRAMetaData raXmlMetaData = new JBossRAMetaData();
-   
+
    public ConnectorMetaData getConnectorMetaData()
    {
       return connectorMetaData;
    }
+
    public void setConnectorMetaData(ConnectorMetaData connectorMetaData)
    {
       this.connectorMetaData = connectorMetaData;
    }
+
    public JBossRAMetaData getRaXmlMetaData()
    {
       return raXmlMetaData;
    }
+
    public void setRaXmlMetaData(JBossRAMetaData raXmlMetaData)
    {
       this.raXmlMetaData = raXmlMetaData;
    }
-   
 }