[jboss-cvs] JBossAS SVN: r82875 - trunk/system/src/main/org/jboss/system/server/profileservice/repository.

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

Author: emuckenhuber
Date: 2009-01-14 11:21:08 -0500 (Wed, 14 Jan 2009)
New Revision: 82875

Modified:
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractFileAttachmentsSerializer.java
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/JAXBAttachmentSerializer.java
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/StaticProfileFactory.java
Log:
update attachmentStoreRoot handling

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java	2009-01-14 16:21:02 UTC (rev 82874)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractAttachmentStore.java	2009-01-14 16:21:08 UTC (rev 82875)
@@ -88,11 +88,11 @@
    /** The logger. */
    private static final Logger log = Logger.getLogger(AbstractAttachmentStore.class);
    
-   public AbstractAttachmentStore(URI uri)
+   public AbstractAttachmentStore(File root)
    {
-      if(uri == null)
+      if(root == null)
          throw new IllegalArgumentException("Null uri");
-      this.attatchmentStoreRoot = uri;
+      this.attatchmentStoreRoot = root.toURI();
    }
    
    public URI getAttachmentStoreRoot()

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractFileAttachmentsSerializer.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractFileAttachmentsSerializer.java	2009-01-14 16:21:02 UTC (rev 82874)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/AbstractFileAttachmentsSerializer.java	2009-01-14 16:21:08 UTC (rev 82875)
@@ -24,7 +24,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.NotSerializableException;
-import java.net.URI;
 
 import org.jboss.logging.Logger;
 
@@ -45,11 +44,11 @@
    /** The deployment pre-processed attachments store dir */
    private final File attachmentsStoreDir;
 
-   public AbstractFileAttachmentsSerializer(URI uri)
+   public AbstractFileAttachmentsSerializer(File dir)
    {
-      if(uri == null)
+      if(dir == null)
          throw new IllegalArgumentException("Null uri");
-      this.attachmentsStoreDir = new File(uri.toString());
+      this.attachmentsStoreDir = dir;
    }
    
    public File getAttachmentsStoreDir()

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/JAXBAttachmentSerializer.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/JAXBAttachmentSerializer.java	2009-01-14 16:21:02 UTC (rev 82874)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/JAXBAttachmentSerializer.java	2009-01-14 16:21:08 UTC (rev 82875)
@@ -54,9 +54,9 @@
    /** The attachment suffix. */
    private static final String ATTACHMENT_SUFFIX = ".attachment.xml";
    
-   public JAXBAttachmentSerializer(URI uri)
+   public JAXBAttachmentSerializer(File dir)
    {
-      super(uri);
+      super(dir);
    }
    
    @SuppressWarnings("unchecked")

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/StaticProfileFactory.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/StaticProfileFactory.java	2009-01-14 16:21:02 UTC (rev 82874)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/StaticProfileFactory.java	2009-01-14 16:21:08 UTC (rev 82875)
@@ -21,6 +21,7 @@
  */ 
 package org.jboss.system.server.profileservice.repository;
 
+import java.io.File;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
@@ -53,7 +54,7 @@
    private URI deployersURI;
    
    /** The attachment store uri. */
-   private URI attachmentStoreRoot;
+   private File attachmentStoreRoot;
    
    /** The application uris. */
    private List<URI> applicationURIs;
@@ -78,12 +79,12 @@
       this.deployersURI = deployersURI;
    }
 
-   public URI getAttachmentStoreRoot()
+   public File getAttachmentStoreRoot()
    {
       return attachmentStoreRoot;
    }
 
-   public void setAttachmentStoreRoot(URI attachmentStoreRoot)
+   public void setAttachmentStoreRoot(File attachmentStoreRoot)
    {
       this.attachmentStoreRoot = attachmentStoreRoot;
    }