[jboss-cvs] JBossAS SVN: r72431 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/jpa and 1 other directory.

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

Author: alesj
Date: 2008-04-18 05:36:50 -0400 (Fri, 18 Apr 2008)
New Revision: 72431

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/jpa/spec/PersistenceMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/jpa/spec/PersistenceUnitMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java
Log:
Clone, toString.
Enable trace for test.

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/jpa/spec/PersistenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/jpa/spec/PersistenceMetaData.java	2008-04-18 09:24:10 UTC (rev 72430)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/jpa/spec/PersistenceMetaData.java	2008-04-18 09:36:50 UTC (rev 72431)
@@ -23,12 +23,15 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.ArrayList;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlAttribute;
 
+import org.jboss.util.JBossObject;
+import org.jboss.util.JBossStringBuilder;
 import org.jboss.xb.annotations.JBossXmlSchema;
 
 /**
@@ -43,7 +46,7 @@
       namespace=PersistenceMetaDataConstants.PERSISTENCE_NS,
       propOrder={"persistenceUnits"}
 )
-public class PersistenceMetaData implements Serializable
+public class PersistenceMetaData extends JBossObject implements Serializable
 {
    private String version;
    private List<PersistenceUnitMetaData> persistenceUnits;
@@ -69,4 +72,24 @@
    {
       this.persistenceUnits = persistenceUnits;
    }
+
+   protected void toString(JBossStringBuilder builder)
+   {
+      builder.append("version=").append(version);
+      if (persistenceUnits != null && persistenceUnits.isEmpty() == false)
+         builder.append(", persistence units=").append(persistenceUnits);
+   }
+
+   public PersistenceMetaData clone()
+   {
+      PersistenceMetaData clone = (PersistenceMetaData)super.clone();
+      if (persistenceUnits != null)
+      {
+         List<PersistenceUnitMetaData> units = new ArrayList<PersistenceUnitMetaData>();
+         for (PersistenceUnitMetaData unit : persistenceUnits)
+            units.add(unit.clone());
+         clone.setPersistenceUnits(units);
+      }
+      return clone;
+   }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/jpa/spec/PersistenceUnitMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/jpa/spec/PersistenceUnitMetaData.java	2008-04-18 09:24:10 UTC (rev 72430)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/jpa/spec/PersistenceUnitMetaData.java	2008-04-18 09:36:50 UTC (rev 72431)
@@ -24,11 +24,15 @@
 import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
+import java.util.HashSet;
+import java.util.HashMap;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlType;
 
+import org.jboss.util.JBossObject;
+import org.jboss.util.JBossStringBuilder;
 import org.jboss.xb.annotations.JBossXmlMapEntry;
 import org.jboss.xb.annotations.JBossXmlMapKeyAttribute;
 import org.jboss.xb.annotations.JBossXmlMapValueAttribute;
@@ -39,7 +43,7 @@
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
 @XmlType(propOrder={"description", "provider", "jtaDataSource", "nonJtaDataSource", "mappingFiles", "jarFiles", "classes", "excludeUnlistedClasses", "properties"})
-public class PersistenceUnitMetaData implements Serializable
+public class PersistenceUnitMetaData extends JBossObject implements Serializable
 {
    private String description;
    private String provider;
@@ -176,4 +180,37 @@
    {
       this.transactionType = transactionType;
    }
+
+   protected void toString(JBossStringBuilder builder)
+   {
+      builder.append("provider=").append(provider);
+      builder.append(", jta-data-source=").append(jtaDataSource);
+      builder.append(", non-jta-data-source=").append(nonJtaDataSource);
+      builder.append(", non-jta-data-source=").append(nonJtaDataSource);
+      if (mappingFiles != null)
+         builder.append(", mapping-files=").append(mappingFiles);
+      if (jarFiles != null)
+         builder.append(", jar-files=").append(jarFiles);
+      if (classes != null)
+         builder.append(", classes=").append(classes);
+      builder.append(", excludeUnlistedClasses=").append(excludeUnlistedClasses);
+      if (properties != null)
+         builder.append(", properties=").append(properties);
+      builder.append(", name=").append(name);
+      builder.append(", transactionType=").append(transactionType);
+   }
+
+   public PersistenceUnitMetaData clone()
+   {
+      PersistenceUnitMetaData clone = (PersistenceUnitMetaData)super.clone();
+      if (mappingFiles != null)
+         clone.setMappingFiles(new HashSet<String>(mappingFiles));
+      if (jarFiles != null)
+         clone.setJarFiles(new HashSet<String>(jarFiles));
+      if (classes != null)
+         clone.setClasses(new HashSet<String>(classes));
+      if (properties != null)
+         clone.setProperties(new HashMap<String, String>(properties));
+      return clone;
+   }
 }

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java	2008-04-18 09:24:10 UTC (rev 72430)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java	2008-04-18 09:36:50 UTC (rev 72431)
@@ -41,6 +41,12 @@
       super(name);
    }
 
+   protected void setUp() throws Exception
+   {
+      super.setUp();
+      enableTrace("org.jboss.xb");
+   }
+
    public void testDefaultMetaData() throws Throwable
    {
       Class<PersistenceMetaData> expected = PersistenceMetaData.class;