[jboss-cvs] JBossAS SVN: r81426 - in trunk: system/src/main/org/jboss/system/server/profileservice/repository and 1 other directory.

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

Author: emuckenhuber
Date: 2008-11-21 07:31:45 -0500 (Fri, 21 Nov 2008)
New Revision: 81426

Modified:
   trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml
   trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
Log:
[JBAS-6223 ] remove hardcoded references to the attachments dir

Modified: trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml	2008-11-21 12:31:27 UTC (rev 81425)
+++ trunk/server/src/etc/conf/default/bootstrap/profile-repository.xml	2008-11-21 12:31:45 UTC (rev 81426)
@@ -35,11 +35,7 @@
       <property name="serializer"><inject bean="AttachmentsSerializer"/></property>
       <property name="mainDeployer"><inject bean="MainDeployer"/></property>
    </bean>
-   <bean name="AttachmentsSerializer" class="org.jboss.system.server.profileservice.repository.JAXBAttachmentSerializer">
-   		<!-- TODO This is getting set in the DeploymentRepository.load, to make sure that we use the same directory. 
-        	<property name="attachmentsStoreDir">${jboss.server.home.dir}attachments</property>
-         -->
-    </bean>
+   <bean name="AttachmentsSerializer" class="org.jboss.system.server.profileservice.repository.JAXBAttachmentSerializer" />
 
    <!-- The Bootstrap implementation that loads the Profile from the ProfileService -->
    <bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">

Modified: trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java	2008-11-21 12:31:27 UTC (rev 81425)
+++ trunk/system/src/main/org/jboss/system/server/profileservice/repository/SerializableDeploymentRepository.java	2008-11-21 12:31:45 UTC (rev 81426)
@@ -674,8 +674,6 @@
       if( libDir.mkdirs() == false )
          throw new IOException("Failed to create profile lib dir: "+libDir);
 
-      if(adminEditsRoot == null)
-         setAttachmentsRoot(profileRoot.getAbsolutePath() +  "/attachments");
       if( adminEditsRoot.exists() == false && adminEditsRoot.mkdirs() == false )
          throw new IOException("Failed to create profile adminEdits dir: "+adminEditsRoot);
    }
@@ -715,7 +713,6 @@
             throw new FileNotFoundException("Profile contains no deploy dir: "+applicationDir);
       }
 
-      adminEditsRoot = new File(profileRoot, "attachments");
       if(this.serializer instanceof AbstractFileAttachmentsSerializer)
          ((AbstractFileAttachmentsSerializer) this.serializer).setAttachmentsStoreDir(adminEditsRoot);