[jboss-cvs] JBossAS SVN: r88571 - branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test.

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

Author: emuckenhuber
Date: 2009-05-09 08:53:03 -0400 (Sat, 09 May 2009)
New Revision: 88571

Modified:
   branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java
   branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java
Log:
cleanup

Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java	2009-05-09 08:54:03 UTC (rev 88570)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java	2009-05-09 12:53:03 UTC (rev 88571)
@@ -32,8 +32,6 @@
 import org.jboss.metatype.api.values.MetaValueFactory;
 import org.jboss.system.server.profileservice.persistence.ManagedObjectPeristenceHandler;
 import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
-import org.jboss.system.server.profileservice.repository.AbstractFileAttachmentsSerializer;
-import org.jboss.system.server.profileservice.repository.JAXBAttachmentSerializer;
 import org.jboss.test.BaseTestCase;
 import org.jboss.xb.binding.Unmarshaller;
 import org.jboss.xb.binding.UnmarshallerFactory;
@@ -87,70 +85,6 @@
       return getMOF().initManagedObject(o, null);
    }
    
-   protected AbstractFileAttachmentsSerializer getAttachmentSerializer() throws Exception
-   {
-      return getAttachmentSerializer(false);
-   }
-   
-   protected AbstractFileAttachmentsSerializer getAttachmentSerializer(boolean logToSystemOut) throws Exception
-   {
-      File tempFile = File.createTempFile(getName(), null);
-      return createSerializer(tempFile, logToSystemOut);
-   }
-
-   /**
-    * Create the attachment Serializer.
-    * Use a tempFile for storing the Xml.
-    * 
-    * @param tempFile the temp File
-    * @return a AttachmentSerializer.
-    * @throws Exception
-    */
-   protected AbstractFileAttachmentsSerializer createSerializer(File tempFile) throws Exception
-   {
-      return createSerializer(tempFile, false);
-   }
-   
-   protected AbstractFileAttachmentsSerializer createSerializer(final File tempFile, final boolean logToSystemOut) throws Exception
-   {
-      return new TempAttachmentSerializer(tempFile);
-   }
-   
-   private class TempAttachmentSerializer extends JAXBAttachmentSerializer
-   {
-      public TempAttachmentSerializer(File tempFile)
-      {
-         super(tempFile);
-      }
-      
-//      @Override
-//      protected <T> T loadAttachment(File attachmentsStore, Class<T> expected) throws Exception
-//      {
-//         Unmarshaller u = UnmarshallerFactory.newInstance().newUnmarshaller();
-//         JBossXBBuilder builder = new JBossXBBuilder();
-//         SchemaBinding binding = builder.build(expected);
-//         return (T) u.unmarshal(attachmentsStore.getAbsolutePath(), binding); 
-//      }
-      
-      @Override
-      protected void saveAttachment(File attachmentsStore, Object attachment) throws Exception
-      {
-         log.trace("saveAttachments, attachmentsStore="+attachmentsStore+ ", attachment="+attachment);
-         JAXBContext ctx = JAXBContext.newInstance(attachment.getClass());
-         Marshaller marshaller = ctx.createMarshaller();
-         marshaller.setProperty("jaxb.formatted.output", Boolean.TRUE);
-         marshaller.marshal(attachment, attachmentsStore);
-         marshaller.marshal(attachment, System.out);
-      }
-      
-      @Override
-      protected File getAttachmentPath(String baseName)
-      {
-         // Return the temp file
-         return getAttachmentsStoreDir();
-      }
-   }
-   
    protected PersistedManagedObject restore(ManagedObject mo) throws Exception
    {
       ManagedObjectPeristenceHandler persistence = new ManagedObjectPeristenceHandler();

Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java	2009-05-09 08:54:03 UTC (rev 88570)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java	2009-05-09 12:53:03 UTC (rev 88571)
@@ -37,11 +37,9 @@
 import org.jboss.metatype.api.values.SimpleValue;
 import org.jboss.metatype.api.values.SimpleValueSupport;
 import org.jboss.system.server.profileservice.persistence.ManagedGenericOverrideHandler;
-import org.jboss.system.server.profileservice.persistence.ManagedObjectPeristenceHandler;
 import org.jboss.system.server.profileservice.persistence.xml.PersistedCollectionValue;
 import org.jboss.system.server.profileservice.persistence.xml.PersistedGenericValue;
 import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
-import org.jboss.system.server.profileservice.repository.AbstractFileAttachmentsSerializer;
 import org.jboss.test.server.profileservice.persistence.support.NestedTestMetaData;
 import org.jboss.test.server.profileservice.persistence.support.PrimitiveMetaData;
 import org.jboss.test.server.profileservice.persistence.support.TestMetaData;
@@ -162,21 +160,6 @@
       return null;
    }
    
-   protected PersistedManagedObject process(ManagedObject mo) throws Exception
-   {
-      // Create root;
-      PersistedManagedObject persisted = new PersistedManagedObject();
-      // Create xml elements
-      ManagedObjectPeristenceHandler handler = new ManagedObjectPeristenceHandler();
-      handler.processManagedObject(persisted, mo);
-
-      // Save
-      AbstractFileAttachmentsSerializer serializer = getAttachmentSerializer(true);
-      serializer.saveAttachment("test", persisted);
-      // Restore
-      return serializer.loadAttachment("test", PersistedManagedObject.class);
-   }
-   
    protected ManagedObject createNestedMO()
    {
       return createMO(createNestedTestMetaData());