[jboss-cvs] JBossAS SVN: r88906 - in branches/Branch_5_x: system/src/tests/org/jboss/test/server/profileservice/component/persistence/test and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu May 14 16:44:42 EDT 2009


Author: emuckenhuber
Date: 2009-05-14 16:44:42 -0400 (Thu, 14 May 2009)
New Revision: 88906

Modified:
   branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/JAXBAttachmentSerializer.java
   branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java
   branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/AbstractPersistenceFormatTest.java
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/JBossServicePersistenceFormatTestCase.java
Log:
cleanup persistence parsing.

Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/JAXBAttachmentSerializer.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/JAXBAttachmentSerializer.java	2009-05-14 20:42:36 UTC (rev 88905)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/repository/JAXBAttachmentSerializer.java	2009-05-14 20:44:42 UTC (rev 88906)
@@ -29,20 +29,13 @@
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
 
 import org.jboss.logging.Logger;
-import org.jboss.system.server.profileservice.attachments.RepositoryAttachmentMetaData;
-import org.jboss.system.server.profileservice.persistence.PersistenceConstants;
-import org.jboss.system.server.profileservice.persistence.xml.PersistenceRoot;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 
 /**
  * A basic JAXB attachment Serializer.
  * 
- * It uses JAXB for marshalling the meta data and JBoss XB to unmarshal.
- * 
  * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
  * @version $Revision$
  */
@@ -55,32 +48,22 @@
    /** The attachment suffix. */
    private static final String ATTACHMENT_SUFFIX = ".attachment.xml";
    
-   /** The default schema resolver. */
-   private static final DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-   
-   static
-   {
-      resolver.addClassBinding(PersistenceConstants.REPOSITORY_NAMESPACE_1_0, RepositoryAttachmentMetaData.class);
-      resolver.addClassBinding(PersistenceConstants.COMPONENT_NAMESPACE_1_0, PersistenceRoot.class);
-   }
-   
    public JAXBAttachmentSerializer(File dir)
    {
       super(dir);
    }
-   
+
    @SuppressWarnings("unchecked")
    protected <T> T loadAttachment(File attachmentsStore, Class<T> expected) throws Exception
    {
-      // JBoss XB
-      log.trace("loadAttachment, attachmentsStore="+attachmentsStore);
-      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-      unmarshaller.setValidation(false);
-      unmarshaller.setSchemaValidation(false);
+      if(log.isTraceEnabled())
+         log.trace("loadAttachment, attachmentsStore=" + attachmentsStore);
+      JAXBContext ctx = JAXBContext.newInstance(expected);
+      Unmarshaller unmarshaller = ctx.createUnmarshaller();
       InputStream is = new FileInputStream(attachmentsStore);
       try
       {
-         return (T) unmarshaller.unmarshal(is, resolver);
+         return (T) unmarshaller.unmarshal(is);
       }
       finally
       {
@@ -90,8 +73,8 @@
 
    protected void saveAttachment(File attachmentsStore, Object attachment) throws Exception
    {
-      // JAXB
-      log.trace("saveAttachment, attachmentsStore="+attachmentsStore+ ", attachment="+attachment);
+      if(log.isTraceEnabled())
+         log.trace("saveAttachment, attachmentsStore="+attachmentsStore+ ", attachment="+attachment);
       JAXBContext ctx = JAXBContext.newInstance(attachment.getClass());
       Marshaller marshaller = ctx.createMarshaller();
       marshaller.setProperty("jaxb.formatted.output", Boolean.TRUE);

Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java	2009-05-14 20:42:36 UTC (rev 88905)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java	2009-05-14 20:44:42 UTC (rev 88906)
@@ -25,17 +25,14 @@
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
 
 import org.jboss.managed.api.factory.ManagedObjectFactory;
 import org.jboss.system.server.profileservice.persistence.AbstractPersistenceFactory;
-import org.jboss.system.server.profileservice.persistence.PersistenceConstants;
 import org.jboss.system.server.profileservice.persistence.PersistenceFactory;
 import org.jboss.system.server.profileservice.persistence.component.ComponentMapper;
 import org.jboss.system.server.profileservice.persistence.xml.PersistenceRoot;
 import org.jboss.test.BaseTestCase;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 
 /**
  * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -50,14 +47,6 @@
    /** The persistence factory. */
    private AbstractPersistenceFactory persistenceFactory = new AbstractPersistenceFactory();
    
-   /** The schema resolver. */
-   protected static final DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-   
-   static
-   {
-      resolver.addClassBinding(PersistenceConstants.COMPONENT_NAMESPACE_1_0, PersistenceRoot.class);
-   }
-   
    public AbstractComponentMapperTest(String name)
    {
       super(name);
@@ -96,8 +85,9 @@
    
    protected PersistenceRoot deserialize(File file) throws Exception
    {
-      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-      return (PersistenceRoot) unmarshaller.unmarshal(file.toURL().openStream(), resolver);
+      JAXBContext ctx = JAXBContext.newInstance(PersistenceRoot.class);
+      Unmarshaller unmarshaller = ctx.createUnmarshaller();
+      return (PersistenceRoot) unmarshaller.unmarshal(file);
    }
 
 }

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-14 20:42:36 UTC (rev 88905)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java	2009-05-14 20:44:42 UTC (rev 88906)
@@ -25,6 +25,7 @@
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
 
 import org.jboss.managed.api.ManagedObject;
 import org.jboss.managed.api.factory.ManagedObjectFactory;
@@ -33,12 +34,8 @@
 import org.jboss.system.server.profileservice.persistence.DelegatingPersistencePlugin;
 import org.jboss.system.server.profileservice.persistence.ManagedObjectPersistencePlugin;
 import org.jboss.system.server.profileservice.persistence.ManagedObjectRecreationHelper;
-import org.jboss.system.server.profileservice.persistence.PersistenceConstants;
 import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
 import org.jboss.test.BaseTestCase;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 
 /**
  * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -53,9 +50,6 @@
    /** A helper. */
    private static final ManagedObjectRecreationHelper helper;
    
-   /** The schema resolver. */
-   protected static final DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-   
    /** The meta value factory */
    private MetaValueFactory metaValueFactory = MetaValueFactory.getInstance();
    
@@ -67,7 +61,6 @@
    
    static
    {
-      resolver.addClassBinding(PersistenceConstants.COMPONENT_NAMESPACE_1_0, PersistedManagedObject.class);
       helper = new ManagedObjectRecreationHelper(managedObjectFactory);
    }
    
@@ -121,8 +114,9 @@
    
    protected PersistedManagedObject deserialize(File file) throws Exception
    {
-      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-      return (PersistedManagedObject) unmarshaller.unmarshal(file.toURL().openStream(), resolver);
+      JAXBContext ctx = JAXBContext.newInstance(PersistedManagedObject.class);
+      Unmarshaller un = ctx.createUnmarshaller();
+      return (PersistedManagedObject) un.unmarshal(file);
    }
    
    protected ManagedObject update(Object attachment, PersistedManagedObject moElement)

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/AbstractPersistenceFormatTest.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/AbstractPersistenceFormatTest.java	2009-05-14 20:42:36 UTC (rev 88905)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/AbstractPersistenceFormatTest.java	2009-05-14 20:44:42 UTC (rev 88906)
@@ -25,6 +25,7 @@
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
 
 import org.jboss.managed.api.ManagedComponent;
 import org.jboss.managed.api.ManagedObject;
@@ -32,15 +33,11 @@
 import org.jboss.managed.plugins.factory.AbstractManagedObjectFactory;
 import org.jboss.metatype.api.values.MetaValueFactory;
 import org.jboss.system.server.profileservice.persistence.AbstractPersistenceFactory;
-import org.jboss.system.server.profileservice.persistence.PersistenceConstants;
 import org.jboss.system.server.profileservice.persistence.PersistenceFactory;
 import org.jboss.system.server.profileservice.persistence.component.ComponentMapper;
 import org.jboss.system.server.profileservice.persistence.xml.PersistenceRoot;
 import org.jboss.test.JBossTestCase;
 import org.jboss.test.profileservice.persistenceformat.support.TestMgtComponentImpl;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 
 /**
  * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -58,14 +55,6 @@
    /** The persistence factory. */
    private AbstractPersistenceFactory persistenceFactory = new AbstractPersistenceFactory();
    
-   /** The schema resolver */
-   protected static final DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-   
-   static
-   {
-      resolver.addClassBinding(PersistenceConstants.COMPONENT_NAMESPACE_1_0, PersistenceRoot.class);
-   }
-   
    public AbstractPersistenceFormatTest(String name)
    {
       super(name);
@@ -125,8 +114,9 @@
    
    protected PersistenceRoot deserialize(File file) throws Exception
    {
-      Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-      return (PersistenceRoot) unmarshaller.unmarshal(file.toURL().openStream(), resolver);
+      JAXBContext ctx = JAXBContext.newInstance(PersistenceRoot.class);
+      Unmarshaller unmarshaller = ctx.createUnmarshaller();
+      return (PersistenceRoot) unmarshaller.unmarshal(file);
    }
 }
 

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/JBossServicePersistenceFormatTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/JBossServicePersistenceFormatTestCase.java	2009-05-14 20:42:36 UTC (rev 88905)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/JBossServicePersistenceFormatTestCase.java	2009-05-14 20:44:42 UTC (rev 88906)
@@ -27,8 +27,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.jboss.managed.api.ManagedComponent;
@@ -50,8 +48,6 @@
 import org.jboss.system.server.profileservice.persistence.xml.PersistedComponent;
 import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
 import org.jboss.system.server.profileservice.persistence.xml.PersistenceRoot;
-import org.jboss.system.server.profileservice.repository.AbstractFileAttachmentsSerializer;
-import org.jboss.system.server.profileservice.repository.JAXBAttachmentSerializer;
 import org.w3c.dom.Document;
 
 /**
@@ -137,7 +133,7 @@
 //      assertClassPaths(deployment.getClassPaths(), restored.getClassPaths());
 //   }
    
-   protected void assertServices(List<ServiceMetaData> original, List<ServiceMetaData> restored)
+   protected void assertServices(List<ServiceMetaData> original, List<ServiceMetaData> restored) throws Exception
    {
       assertNotNull(original);
       assertNotNull(restored);
@@ -157,7 +153,7 @@
       }
    }
    
-   protected void assertServiceMetaData(ServiceMetaData original, ServiceMetaData restored)
+   protected void assertServiceMetaData(ServiceMetaData original, ServiceMetaData restored) throws Exception
    {
       // Code
       assertEquals(original.getCode(), restored.getCode());
@@ -203,7 +199,8 @@
          assertNull(restored.getDependencies());
       }
       
-      assertAttributes(original.getAttributes(), restored.getAttributes());
+//      assertAttributes(original.getAttributes(), restored.getAttributes());
+      assertDependencies(original.getDependencies(), restored.getDependencies());
       
    }
    
@@ -252,7 +249,7 @@
    }
    
 
-   protected void assertServiceConstructor(ServiceConstructorMetaData original, ServiceConstructorMetaData restored)
+   protected void assertServiceConstructor(ServiceConstructorMetaData original, ServiceConstructorMetaData restored) throws Exception
    {
       if(original == null)
       {
@@ -268,9 +265,32 @@
       {
          assertNotNull(restored.getParams());
          assertEquals(original.getParams().length, restored.getParams().length);
+         assertEquals(original.getParams(), restored.getParams());
       }
+      if(original.getSignature() != null)
+      {
+         assertNotNull(restored.getSignature());
+         assertEquals(original.getParams().length, restored.getParams().length);
+         assertEquals(original.getSignature(), restored.getSignature());
+      }
    }
    
+   protected void assertDependencies(List<ServiceDependencyMetaData> original, List<ServiceDependencyMetaData> restored)
+   {
+      if(original == null)
+      {
+         assertNull(restored);
+         return;
+      }
+      else
+      {
+         assertNotNull(restored);
+      }
+         
+      assertEquals(original.size(), restored.size());
+      // TODO assertDependency
+   }
+   
    protected void assertDependency(ServiceDependencyMetaData original, ServiceDependencyMetaData restored)
    {
       if(original == null)
@@ -339,60 +359,6 @@
       return deployment;
    }
    
-   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 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);
-      }
-      
-      @Override
-      protected File getAttachmentPath(String baseName)
-      {
-         // Return the temp file
-         return getAttachmentsStoreDir();
-      }
-   }
-   
    private static final class TestMapper extends ServiceDeploymentComponentMapper
    {
 




More information about the jboss-cvs-commits mailing list