continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r683689 [3/7] - in /continuum/branches/continuum-refactoring-evenisse: ./ continuum-api/ continuum-api/src/main/java/org/apache/continuum/dao/ continuum-api/src/main/java/org/apache/continuum/purge/ continuum-api/src/main/java/org/apache/co...
Date Thu, 07 Aug 2008 19:38:56 GMT
Modified: continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt Thu Aug  7 12:38:49 2008
@@ -9,20 +9,20 @@
 
 Add a Project
 
-%{toc|section=0}
+~~%{toc|section=0}
 
 * {Maven 2 project}
 
   From the menu, choose the 'Maven 2.0.x Project' entry
     
-[./../../../../images/add-m2-project-menu.png] Add a maven2 project
+[../../images/add-m2-project-menu.png] Add a maven2 project
 
   The pom.xml file must be available through one of the following format : http, https and ftp 
   (file protocol is off by default for security and must enabled manually).
     
   Or it can be uploaded (Note this doesn't support multi modules project).
     
-[./../../../../images/add-m2-project.png] Add a maven2 project
+[../../images/add-m2-project.png] Add a maven2 project
 
   You can define username/password if the POM URL require an authentication.
 
@@ -38,7 +38,7 @@
     
   From the menu, choose the 'Maven 1.x Project' entry
     
-[./../../../../images/add-m1-project-menu.png] Add a maven1 project
+[../../images/add-m1-project-menu.png] Add a maven1 project
 
   The project.xml file must be available through one of the following format : http, https and ftp 
   (file protocol is off by default for security and must enabled manually).
@@ -47,7 +47,7 @@
 
   The project you're adding can't use a parent.
     
-[./../../../../images/add-m1-project.png] Add a maven1 project
+[../../images/add-m1-project.png] Add a maven1 project
 
   You can define username/password if the POM URL require an authentication.
 
@@ -61,27 +61,27 @@
 
   From the menu, choose the 'Ant Project' entry
     
-[./../../../../images/add-ant-project-menu.png] Add a ANT project
+[../../images/add-ant-project-menu.png] Add a ANT project
 
     TO WRITE
 
-[./../../../../images/add-ant-project.png] Add a ANT project
+[../../images/add-ant-project.png] Add a ANT project
 
 * {Shell Project}
 
   From the menu, choose the 'Shell Project' entry
     
-[./../../../../images/add-shell-project-menu.png] Add a shell project
+[../../images/add-shell-project-menu.png] Add a shell project
 
     TO WRITE
 
-[./../../../../images/add-shell-project.png] Add a shell script project
+[../../images/add-shell-project.png] Add a shell script project
 
 * {Add a project from the Project Group}
 
     From the Project Group, you can add a project without to use the menu. With this operation, the Project Group will be set to the current group.
 
-[./../../../../images/add-project-from-group.png] Add a project from a project group
+[../../images/add-project-from-group.png] Add a project from a project group
 
 * {Scm hints}
 

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt Thu Aug  7 12:38:49 2008
@@ -9,7 +9,7 @@
 
 Edit a Project
 
-%{toc|section=0}
+~~%{toc|section=0}
 
 * {Project View}
 
@@ -28,7 +28,7 @@
 
   []
 
-[../../../../images/project-view-top.png] Project View Top
+[../../images/project-view-top.png] Project View Top
 
   With the <<<'Edit'>>> button, you can change some project informations like the scm url if your project was moved.
   With the <<<'Build Now'>>> button, you build the project manually with the default build definition.
@@ -43,7 +43,7 @@
 
   []
 
-[../../../../images/project-view-bottom.png] Project View Bottom
+[../../images/project-view-bottom.png] Project View Bottom
 
 * {Build Results}
 
@@ -51,7 +51,7 @@
   You will see all build results summary : start/end Time, result.
   It's possible to delete some build results with checkboxes
 
-[../../../../images/build-results.png] Build Results
+[../../images/build-results.png] Build Results
 
   Now you can edit a build result
 
@@ -69,7 +69,7 @@
 
   []
 
-[../../../../images/build-result.png] Build Result
+[../../images/build-result.png] Build Result
 
 
 

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt Thu Aug  7 12:38:49 2008
@@ -10,6 +10,6 @@
 
     To remove a project, go to the project group summary and use the <<delete>> icon.
 
-[./../../../../images/delete.gif] Delete icon
+[../../images/delete.gif] Delete icon
 
     You can also use the <<<'Delete group'>>> button in the project group summary to remove the whole project group.

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/notification/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/notification/index.apt?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/notification/index.apt (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/notification/index.apt Thu Aug  7 12:38:49 2008
@@ -33,15 +33,15 @@
 
   Or they can be added to a projectGroup with the Notifiers link :
   
-[./../../../../images/notifiers-link-project-group.png] Notifiers Link  
+[../../images/notifiers-link-project-group.png] Notifiers Link  
   
   Or to a project with the add button in the edit project page :
   
-[./../../../../images/notifiers-button-project.png] Notifier Button 
+[../../images/notifiers-button-project.png] Notifier Button 
 
   Here you will the choice between notifiers implementation provided with continuum
 
-[./../../../../images/notifiers-type-choice.png] Notifier Type Choice
+[../../images/notifiers-type-choice.png] Notifier Type Choice
 
   You have the following choices :
   

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/notification/mail.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/notification/mail.apt?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/notification/mail.apt (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/notification/mail.apt Thu Aug  7 12:38:49 2008
@@ -27,4 +27,4 @@
 
   Or can you can add manually mail notifier to you project group and/or project
   
-[./../../../../images/notifier-mail-add.png] Add Email Notifier 
+[../../images/notifier-mail-add.png] Add Email Notifier 

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/release/perform.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/release/perform.apt?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/release/perform.apt (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/release/perform.apt Thu Aug  7 12:38:49 2008
@@ -6,12 +6,12 @@
 
  Choose "Perform Release" and the version number
 
-[./../../images/release-choose-perform-goal.png]
+[../../images/release-choose-perform-goal.png]
 
  Fill in the form and click Submit
 
-[./../../images/release-perform-parameters.png]
+[../../images/release-perform-parameters.png]
 
  Wait for the process to complete, then click Done.
 
-[./../../images/release-perform-executing.png]
\ No newline at end of file
+[../../images/release-perform-executing.png]

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/release/prepare.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/release/prepare.apt?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/release/prepare.apt (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/release/prepare.apt Thu Aug  7 12:38:49 2008
@@ -6,20 +6,20 @@
 
  Navigate to the Project Group Summary and click the Release button or icon.
 
-[./../../images/release-project-group-summary.png] Release
+[../../images/release-project-group-summary.png] Release
 
  Choose "Prepare project for release" and click "Submit"
 
-[./../../images/release-choose-prepare-goal.png] Release
+[../../images/release-choose-prepare-goal.png] Release
 
  Complete the form, providing the scm tag name, etc.
 
-[./../../images/release-prepare-parameters.png] Release Prepare parameters
+[../../images/release-prepare-parameters.png] Release Prepare parameters
 
  Wait for the process to complete, then click Done.
 
-[./../../images/release-prepare-executing.png]
+[../../images/release-prepare-executing.png]
 
  You will be returned to this page to make another selection
 
-[./../../images/release-choose-perform-goal.png]
\ No newline at end of file
+[../../images/release-choose-perform-goal.png]

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/viewing_queues/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/viewing_queues/index.apt?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/viewing_queues/index.apt (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/apt/user_guides/viewing_queues/index.apt Thu Aug  7 12:38:49 2008
@@ -10,7 +10,7 @@
 
 	Click the <<Queues>> link under the <<Administration>> section
 
-[../images/queues.png] Queues
+[../../images/queues.png] Queues
 
 	You can only view the current checkout, current build, checkout queues and build queues. 
  

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/site.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/site.xml?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/site.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-docs/src/site/site.xml Thu Aug  7 12:38:49 2008
@@ -19,125 +19,79 @@
   -->
 
 <project name="Apache Continuum">
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-stylus-skin</artifactId>
-    <version>1.0.1</version>
-  </skin>
-  <bannerLeft>
-    <name>Maven</name>
-    <src>http://maven.apache.org/maven2/images/apache-maven-project-2.png</src>
-    <href>http://maven.apache.org/</href>
-  </bannerLeft>
-  <bannerRight>
-    <name>Apache Continuum</name>
-    <src>images/continuum_logo.jpg</src>
-    <href>http://continuum.apache.org</href>
-  </bannerRight>
-  <publishDate format="dd MMM yyyy" />
   <body>
-    <links>
-      <item name="Apache" href="http://www.apache.org/"/>
-      <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x"/>
-      <item name="Maven 2.x" href="http://maven.apache.org/"/>
-      <item name="Continuum" href="http://continuum.apache.org/"/>
-      <item name="SCM" href="http://maven.apache.org/scm"/>
-      <item name="Wagon" href="http://maven.apache.org/wagon"/>
-      <item name="JXR" href="http://maven.apache.org/jxr"/>
-      <item name="DOXIA" href="http://maven.apache.org/doxia"/>
-    </links>
-
-    <menu name="Main">
-      <item name="Home" href="index.html"/>
-      <item name="Download" href="download.html"/>
-      <item name="Change Log" href="change-log.html"/>
-      <item name="Users Wiki" href="http://docs.codehaus.org/display/CONTINUUMUSER"/>
-      <item name="Articles" href="articles.html"/>
-      <item name="Features" href="features.html"/>
-      <item name="Live Demo" href="http://vmbuild.apache.org/continuum/"/>
-    </menu>
+    <breadcrumbs>
+      <item name="1.1" href="/" />
+    </breadcrumbs>
     <menu name="Documentation">
-      <item name="Index (category)" href="documentation/1_1/index.html"/>
-      <item name="Getting Started" href="documentation/1_1/getting-started.html"/>
-      <item name="Installation/Upgrade Guides" href="documentation/1_1/installation/index.html" collapse="true">
-        <item name="System Requirements" href="documentation/1_1/installation/requirements.html"/>
-        <item name="Installation" href="documentation/1_1/installation/installation.html" collapse="true">
-          <item name="Standalone" href="documentation/1_1/installation/standalone.html"/>
-          <item name="Tomcat" href="documentation/1_1/installation/tomcat.html"/>
-          <item name="JBoss" href="documentation/1_1/installation/jboss.html"/>
-          <item name="Jetty" href="documentation/1_1/installation/jetty.html"/>
-          <item name="Geronimo" href="documentation/1_1/installation/geronimo.html"/>
-          <item name="Glassfish" href="documentation/1_1/installation/glassfish.html"/>
+      <item name="Index (category)" href="index.html"/>
+      <item name="Getting Started" href="getting-started.html"/>
+      <item name="Installation/Upgrade Guides" href="installation/index.html" collapse="true">
+        <item name="System Requirements" href="installation/requirements.html"/>
+        <item name="Installation" href="installation/installation.html" collapse="true">
+          <item name="Standalone" href="installation/standalone.html"/>
+          <item name="Tomcat" href="installation/tomcat.html"/>
+          <item name="JBoss" href="installation/jboss.html"/>
+          <item name="Jetty" href="installation/jetty.html"/>
+          <item name="Geronimo" href="installation/geronimo.html"/>
+          <item name="Glassfish" href="installation/glassfish.html"/>
         </item>
-        <item name="Release Notes" href="documentation/1_1/installation/release-notes.html"/>
-        <item name="Upgrade" href="documentation/1_1/installation/upgrade.html"/>
+        <item name="Release Notes" href="installation/release-notes.html"/>
+        <item name="Upgrade" href="installation/upgrade.html"/>
       </item>
-      <item name="User's Guides" collapse="true" href="documentation/1_1/user_guides/index.html">
-        <item name="Getting Started" href="documentation/1_1/getting-started.html"/>
-        <item name="Managing Projects" href="documentation/1_1/user_guides/managing_project/index.html" collapse="true">
-          <item name="Add a Project" href="documentation/1_1/user_guides/managing_project/addProject.html"/>
-          <item name="Edit a Project" href="documentation/1_1/user_guides/managing_project/editProject.html"/>
-          <item name="Remove a Project" href="documentation/1_1/user_guides/managing_project/removeProject.html"/>
+      <item name="User's Guides" collapse="true" href="user_guides/index.html">
+        <item name="Getting Started" href="getting-started.html"/>
+        <item name="Managing Projects" href="user_guides/managing_project/index.html" collapse="true">
+          <item name="Add a Project" href="user_guides/managing_project/addProject.html"/>
+          <item name="Edit a Project" href="user_guides/managing_project/editProject.html"/>
+          <item name="Remove a Project" href="user_guides/managing_project/removeProject.html"/>
           <!-- item name="SCM security hints"/ -->
         </item>
-        <item name="Managing Build Definitions" href="documentation/1_1/user_guides/managing_builddef/index.html" collapse="true">
-          <item name="Project Build Definition" href="documentation/1_1/user_guides/managing_builddef/builddefProject.html"/>
-          <item name="Project Group Build Definition" href="documentation/1_1/user_guides/managing_builddef/builddefGroup.html"/>
-        </item>
-        <item name="Managing Notification" href="documentation/1_1/user_guides/notification/index.html" collapse="true">
-          <item name="Mail Notification" href="documentation/1_1/user_guides/notification/mail.html"/>
-          <item name="IRC Notification" href="documentation/1_1/user_guides/notification/irc.html"/>
-          <item name="Jabber Notification" href="documentation/1_1/user_guides/notification/jabber.html">
-            <item name="Google Talk Notification" href="documentation/1_1/user_guides/notification/jabber.html#GTalk"/>
+        <item name="Managing Build Definitions" href="user_guides/managing_builddef/index.html" collapse="true">
+          <item name="Project Build Definition" href="user_guides/managing_builddef/builddefProject.html"/>
+          <item name="Project Group Build Definition" href="user_guides/managing_builddef/builddefGroup.html"/>
+        </item>
+        <item name="Managing Notification" href="user_guides/notification/index.html" collapse="true">
+          <item name="Mail Notification" href="user_guides/notification/mail.html"/>
+          <item name="IRC Notification" href="user_guides/notification/irc.html"/>
+          <item name="Jabber Notification" href="user_guides/notification/jabber.html">
+            <item name="Google Talk Notification" href="user_guides/notification/jabber.html#GTalk"/>
           </item>
-          <item name="MSN Notification" href="documentation/1_1/user_guides/notification/msn.html"/>
-          <item name="Wagon Notification" href="documentation/1_1/user_guides/notification/wagon.html"/>
+          <item name="MSN Notification" href="user_guides/notification/msn.html"/>
+          <item name="Wagon Notification" href="user_guides/notification/wagon.html"/>
         </item>
-        <item name="Building a project" href="documentation/1_1/user_guides/building_project/index.html" collapse="true">
-          <item name="Scheduled Build" href="documentation/1_1/user_guides/building_project/index.html#Scheduled Build"/>
-          <item name="Forced Build" href="documentation/1_1/user_guides/building_project/index.html#Forced Build"/>
+        <item name="Building a project" href="user_guides/building_project/index.html" collapse="true">
+          <item name="Scheduled Build" href="user_guides/building_project/index.html#Scheduled Build"/>
+          <item name="Forced Build" href="user_guides/building_project/index.html#Forced Build"/>
         </item>
-        <item name="Release Management" href="documentation/1_1/user_guides/release/index.html"/>
-        <item name="Queues" href="documentation/1_1/user_guides/viewing_queues/index.html"/>
+        <item name="Release Management" href="user_guides/release/index.html"/>
       </item>
-      <item name="Knowledge Base" href="documentation/1_1/knowledge_base/index.html" collapse="true">
+      <item name="Knowledge Base" href="knowledge_base/index.html" collapse="true">
         <item name="FAQs" href="faqs.html"/>
       </item>
-      <item name="Administrator's Guides" href="documentation/1_1/administrator_guides/index.html" collapse="true">
-        <item name="Managing Users and Security" href="documentation/1_1/administrator_guides/security/index.html" collapse="true">
-          <item name="Security Configuration" href="documentation/1_1/administrator_guides/security/customising-security.html"/>
-          <item name="LDAP Configuration" href="documentation/1_1/administrator_guides/security/ldap.html"/>
-        </item>
-        <item name="Adding Project Group" href="documentation/1_1/administrator_guides/projectgroup.html"/>
-        <item name="Managing Builders" href="documentation/1_1/administrator_guides/builder.html"/>
-        <item name="Managing JDKs" href="documentation/1_1/administrator_guides/jdk.html"/>
-        <item name="Managing Profiles" href="documentation/1_1/administrator_guides/profiles.html"/>
-        <item name="Managing Schedules" href="documentation/1_1/administrator_guides/schedules.html"/>
-        <item name="Managing General Configuration" href="documentation/1_1/administrator_guides/configuration.html"/> <!-- (configuration and appearance) -->
-        <item name="External databases" href="documentation/1_1/administrator_guides/external-db.html"/>
-        <item name="Monitoring Continuum" href="documentation/1_1/administrator_guides/monitoring.html"/>
-        <item name="Appearance Configuration" href="documentation/1_1/administrator_guides/appearance.html"/>
-        <item name="Build Definition Template" href="documentation/1_1/administrator_guides/builddefTemplate.html"/>
-        <item name="Shutdown Continuum" href="documentation/1_1/administrator_guides/shutdown.html"/>
-        <item name="Managing Queues" href="documentation/1_1/administrator_guides/queues.html"/> 
-        <item name="Running builds in chroot jail" href="documentation/1_1/administrator_guides/chroot.html"/>
+      <item name="Administrator's Guides" href="administrator_guides/index.html" collapse="true">
+        <item name="Managing Users and Security" href="administrator_guides/security/index.html" collapse="true">
+          <item name="Security Configuration" href="administrator_guides/security/customising-security.html"/>
+          <item name="LDAP Configuration" href="administrator_guides/security/ldap.html"/>
+        </item>
+        <item name="Adding Project Group" href="administrator_guides/projectgroup.html"/>
+        <item name="Managing Builders" href="administrator_guides/builder.html"/>
+        <item name="Managing JDKs" href="administrator_guides/jdk.html"/>
+        <item name="Managing Profiles" href="administrator_guides/profiles.html"/>
+        <item name="Managing Schedules" href="administrator_guides/schedules.html"/>
+        <item name="Managing General Configuration" href="administrator_guides/configuration.html"/> <!-- (configuration and appearance) -->
+        <item name="External databases" href="administrator_guides/external-db.html"/>
+        <item name="Monitoring Continuum" href="administrator_guides/monitoring.html"/>
+        <item name="Appearance Configuration" href="administrator_guides/appearance.html"/>
+        <item name="Build Definition Template" href="documentation/1_1/administrator_guides/builddefTemplate.html"/>        
+        <item name="Shutdown Continuum" href="administrator_guides/shutdown.html"/>
       </item>
-      <item name="Developer's Guides" href="documentation/1_1/developer_guides/index.html" collapse="true">
-        <!-- item name="SVN repository structure" href="documentation/1_1/developer_guides/svn.html"/ -->
-        <item name="Building Continuum" href="documentation/1_1/developer_guides/building.html"/>
-        <!-- item name="Design" href="documentation/1_1/developer_guides/design.html"/ -->
-        <item name="XML-RPC" href="documentation/1_1/developer_guides/xmlrpc.html"/>
+      <item name="Developer's Guides" href="developer_guides/index.html" collapse="true">
+        <!-- item name="SVN repository structure" href="developer_guides/svn.html"/ -->
+        <item name="Building Continuum" href="developer_guides/building.html"/>
+        <!-- item name="Design" href="developer_guides/design.html"/ -->
+        <item name="XML-RPC" href="developer_guides/xmlrpc.html"/>
       </item>
     </menu>
-    <menu name="Community">
-      <item name="Community Overview" href="community.html"/>
-      <item name="How to Contribute" href="guide-helping.html"/>
-      <item name="Getting Help" href="getting-help.html"/>
-      <item name="Issue Tracking" href="issue-tracking.html"/>
-      <item name="The Continuum Team" href="team-list.html"/>
-      <item name="Mailing Lists" href="mail-lists.html"/>
-      <item name="Source Repository" href="source-repository.html"/>
-      <item name="License" href="license.html"/>
-    </menu>
   </body>
 </project>

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-model/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-model/pom.xml?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-model/pom.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-model/pom.xml Thu Aug  7 12:38:49 2008
@@ -63,7 +63,7 @@
           </execution>
         </executions>
         <configuration>
-          <version>1.1.0</version>
+          <version>1.1.1</version>
           <packageWithVersion>false</packageWithVersion>
           <model>src/main/mdo/continuum.xml</model>
         </configuration>
@@ -99,5 +99,9 @@
       <artifactId>stax-api</artifactId>
       <version>1.0.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
   </dependencies>
 </project>

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-model/src/main/mdo/continuum.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-model/src/main/mdo/continuum.xml?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-model/src/main/mdo/continuum.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-model/src/main/mdo/continuum.xml Thu Aug  7 12:38:49 2008
@@ -75,6 +75,30 @@
             <multiplicity>*</multiplicity>
           </association>
         </field>
+        <field>
+          <name>localRepositories</name>
+          <version>1.1.1+</version>
+          <association>
+            <type>LocalRepository</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>repositoryPurgeConfigurations</name>
+          <version>1.1.1+</version>
+          <association>
+            <type>RepositoryPurgeConfiguration</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>directoryPurgeConfigurations</name>
+          <version>1.1.1+</version>
+          <association>
+            <type>DirectoryPurgeConfiguration</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
       </fields>
     </class>
 
@@ -128,6 +152,13 @@
             <multiplicity>*</multiplicity>
           </association>
         </field>
+        <field>
+          <name>localRepository</name>
+          <version>1.1.1+</version>
+          <association xml.reference="true" stash.part="true" jpox.dependent="false">
+            <type>LocalRepository</type>
+          </association>
+        </field>
       </fields>
     </class>
 
@@ -1281,5 +1312,156 @@
         </codeSegment>
       </codeSegments>
     </class>
+    <class>
+      <name>LocalRepository</name>
+      <version>1.1.1+</version>
+      <packageName>org.apache.continuum.model.repository</packageName>
+      <fields>
+        <field>
+          <name>id</name>
+          <version>1.1.1+</version>
+          <type>int</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>name</name>
+          <version>1.1.1+</version>
+          <type>String</type>
+          <required>true</required>
+        </field>
+        <field jpox.column="repoLocation">
+          <name>location</name>
+          <version>1.1.1+</version>
+          <type>String</type>
+          <required>true</required>
+          <description>
+          The file system location for this repository
+          </description>
+        </field>
+        <field>
+          <name>layout</name>
+          <version>1.1.1+</version>
+          <type>String</type>
+          <defaultValue>default</defaultValue>
+          <description>
+          The layout of the repository. Valid values are "default" and "legacy"
+          </description>
+        </field>
+      </fields>
+    </class>
+    
+    <class>
+      <name>AbstractPurgeConfiguration</name>
+      <version>1.1.1+</version>
+      <abstract>true</abstract>
+      <packageName>org.apache.continuum.model.repository</packageName>
+      <fields>
+        <field>
+          <name>id</name>
+          <version>1.1.1+</version>
+          <identifier>true</identifier>
+          <type>int</type>
+        </field>
+        <field>
+          <name>description</name>
+          <version>1.1.1+</version>
+          <type>String</type>
+        </field>
+        <field>
+          <name>deleteAll</name>
+          <version>1.1.1+</version>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+        </field>
+        <field>
+          <name>retentionCount</name>
+          <version>1.1.1+</version>
+          <type>int</type>
+          <defaultValue>2</defaultValue>
+          <description>
+          The total count of the artifact for each snapshot or the release/build output folder to be retained.
+          </description>
+        </field>
+        <field>
+          <name>daysOlder</name>
+          <version>1.1.1+</version>
+          <type>int</type>
+          <defaultValue>100</defaultValue>
+          <description>
+          The number of days old which will be the basis for removing a snapshot or a folder.
+          </description>
+        </field>
+        <field>
+          <name>enabled</name>
+          <version>1.1.1+</version>
+          <type>boolean</type>
+          <defaultValue>true</defaultValue>
+        </field>
+        <field>
+          <name>schedule</name>
+          <version>1.1.1+</version>
+          <association xml.reference="true" stash.part="true" jpox.dependent="false">
+            <type>Schedule</type>
+          </association>
+        </field>
+        <field>
+          <name>defaultPurge</name>
+          <version>1.1.1+</version>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+        </field>
+      </fields>
+    </class>
+    <class>
+      <name>RepositoryPurgeConfiguration</name>
+      <version>1.1.1+</version>
+      <superClass>AbstractPurgeConfiguration</superClass>
+      <packageName>org.apache.continuum.model.repository</packageName>
+      <fields>
+        <field>
+          <name>repository</name>
+          <version>1.1.1+</version>
+          <association xml.reference="true" stash.part="true" jpox.dependent="false">
+            <type>LocalRepository</type>
+          </association>
+          <required>true</required>
+        </field>
+        <field>
+          <name>deleteReleasedSnapshots</name>
+          <version>1.1.1+</version>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+          <description>
+            True if the released snapshots are to be removed from the repo during repository purge.
+          </description>
+        </field>
+      </fields>
+    </class>
+    <class>
+      <name>DirectoryPurgeConfiguration</name>
+      <version>1.1.1+</version>
+      <superClass>AbstractPurgeConfiguration</superClass>
+      <packageName>org.apache.continuum.model.repository</packageName>
+      <fields>
+        <field jpox.column="directoryLocation">
+          <name>location</name>
+          <version>1.1.1+</version>
+          <type>String</type>
+          <description>
+            The file system path for this directory
+          </description>
+          <required>true</required>
+        </field>
+        <field>
+          <name>directoryType</name>
+          <version>1.1.1+</version>
+          <type>String</type>
+          <description>
+            The type of directory. Valid values are "releases" and "buildOutput"
+          </description>
+        </field>
+      </fields>
+    </class>
+        
   </classes>
 </model>

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-jabber/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-jabber/pom.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-jabber/pom.xml Thu Aug  7 12:38:49 2008
@@ -36,6 +36,12 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-jabber</artifactId>
       <version>1.0-alpha-4</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-msn/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-msn/pom.xml?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-msn/pom.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-msn/pom.xml Thu Aug  7 12:38:49 2008
@@ -31,6 +31,12 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-msn</artifactId>
       <version>1.0-alpha-2</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.continuum</groupId>
@@ -38,4 +44,4 @@
       <version>${pom.version}</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-wagon/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-wagon/pom.xml?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-wagon/pom.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-wagon/pom.xml Thu Aug  7 12:38:49 2008
@@ -46,6 +46,10 @@
       <artifactId>wagon-provider-api</artifactId>
     </dependency>      
     <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-api</artifactId>
+    </dependency>    
+    <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-test</artifactId>
       <scope>test</scope>

Modified: continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/WagonContinuumNotifierTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/WagonContinuumNotifierTest.java?rev=683689&r1=683688&r2=683689&view=diff
==============================================================================
--- continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/WagonContinuumNotifierTest.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/WagonContinuumNotifierTest.java Thu Aug  7 12:38:49 2008
@@ -26,13 +26,13 @@
 import org.apache.maven.continuum.notification.MessageContext;
 import org.apache.maven.continuum.notification.Notifier;
 import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 
 /**
  * @author <a href="mailto:nramirez@exist">Napoleon Esmundo C. Ramirez</a>
  */
 public class WagonContinuumNotifierTest
-    extends PlexusTestCase
+    extends PlexusInSpringTestCase
 {
     private ServletServer server;
 

Propchange: continuum/branches/continuum-refactoring-evenisse/continuum-purge/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug  7 12:38:49 2008
@@ -0,0 +1,4 @@
+.classpath
+.settings
+.project
+target

Copied: continuum/branches/continuum-refactoring-evenisse/continuum-purge/pom.xml (from r682986, continuum/trunk/continuum-purge/pom.xml)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-purge/pom.xml?p2=continuum/branches/continuum-refactoring-evenisse/continuum-purge/pom.xml&p1=continuum/trunk/continuum-purge/pom.xml&r1=682986&r2=683689&rev=683689&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/pom.xml (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-purge/pom.xml Thu Aug  7 12:38:49 2008
@@ -17,7 +17,8 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>continuum</artifactId>
@@ -43,7 +44,7 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-taskqueue</artifactId>
     </dependency>
-	<dependency>
+    <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-common</artifactId>
       <version>${archiva.version}</version>
@@ -86,7 +87,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    
+
     <!-- === Testing Dependencies === -->
     <dependency>
       <groupId>hsqldb</groupId>
@@ -99,7 +100,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
       <plugin>

Copied: continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java (from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java?p2=continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java&r1=682986&r2=683689&rev=683689&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/ContinuumPurgeConstants.java Thu Aug  7 12:38:49 2008
@@ -27,8 +27,8 @@
 public class ContinuumPurgeConstants
 {
     public static final String PURGE_REPOSITORY = "repository";
-    
+
     public static final String PURGE_DIRECTORY_RELEASES = "releases";
-    
+
     public static final String PURGE_DIRECTORY_BUILDOUTPUT = "buildOutput";
 }

Copied: continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java (from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java?p2=continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java&r1=682986&r2=683689&rev=683689&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/DefaultPurgeConfigurationService.java Thu Aug  7 12:38:49 2008
@@ -19,16 +19,15 @@
  * under the License.
  */
 
-import java.util.ArrayList;
-import java.util.List;
-
+import org.apache.continuum.dao.DirectoryPurgeConfigurationDao;
+import org.apache.continuum.dao.LocalRepositoryDao;
+import org.apache.continuum.dao.RepositoryPurgeConfigurationDao;
 import org.apache.continuum.model.repository.AbstractPurgeConfiguration;
 import org.apache.continuum.model.repository.DirectoryPurgeConfiguration;
 import org.apache.continuum.model.repository.LocalRepository;
 import org.apache.continuum.model.repository.RepositoryPurgeConfiguration;
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
-import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
@@ -37,29 +36,42 @@
 import org.codehaus.plexus.context.ContextException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * DefaultPurgeConfigurationService
- * 
+ *
  * @author Maria Catherine Tan
  * @version $Id$
- * @since 25 jul 07
  * @plexus.component role="org.apache.continuum.purge.PurgeConfigurationService" role-hint="default"
+ * @since 25 jul 07
  */
 public class DefaultPurgeConfigurationService
     implements PurgeConfigurationService, Contextualizable
 {
     /**
-     * @plexus.requirement role-hint="jdo"
+     * @plexus.requirement
      */
-    private ContinuumStore store;
- 
+    private DirectoryPurgeConfigurationDao directoryPurgeConfigurationDao;
+
+    /**
+     * @plexus.requirement
+     */
+    private LocalRepositoryDao localRepositoryDao;
+
+    /**
+     * @plexus.requirement
+     */
+    private RepositoryPurgeConfigurationDao repositoryPurgeConfigurationDao;
+
     private PlexusContainer container;
- 
+
     public AbstractPurgeConfiguration addPurgeConfiguration( AbstractPurgeConfiguration purgeConfig )
         throws PurgeConfigurationServiceException
     {
         AbstractPurgeConfiguration purgeConfiguration = null;
-        
+
         if ( purgeConfig instanceof RepositoryPurgeConfiguration )
         {
             purgeConfiguration = addRepositoryPurgeConfiguration( (RepositoryPurgeConfiguration) purgeConfig );
@@ -68,10 +80,10 @@
         {
             purgeConfiguration = addDirectoryPurgeConfiguration( (DirectoryPurgeConfiguration) purgeConfig );
         }
-        
+
         return purgeConfiguration;
     }
-    
+
     public void updatePurgeConfiguration( AbstractPurgeConfiguration purgeConfig )
         throws PurgeConfigurationServiceException
     {
@@ -84,12 +96,12 @@
             updateDirectoryPurgeConfiguration( (DirectoryPurgeConfiguration) purgeConfig );
         }
     }
-    
+
     public void removePurgeConfiguration( int purgeConfigId )
         throws PurgeConfigurationServiceException
     {
         AbstractPurgeConfiguration purgeConfig = getPurgeConfiguration( purgeConfigId );
-        
+
         if ( purgeConfig instanceof RepositoryPurgeConfiguration )
         {
             removeRepositoryPurgeConfiguration( (RepositoryPurgeConfiguration) purgeConfig );
@@ -99,45 +111,45 @@
             removeDirectoryPurgeConfiguration( (DirectoryPurgeConfiguration) purgeConfig );
         }
     }
-    
+
     public DirectoryPurgeConfiguration addDirectoryPurgeConfiguration( DirectoryPurgeConfiguration dirPurge )
         throws PurgeConfigurationServiceException
     {
         DirectoryPurgeConfiguration dirPurgeConfig = null;
-        
+
         try
         {
-            dirPurgeConfig = store.addDirectoryPurgeConfiguration( dirPurge );
+            dirPurgeConfig = directoryPurgeConfigurationDao.addDirectoryPurgeConfiguration( dirPurge );
         }
         catch ( ContinuumStoreException e )
         {
             throw new PurgeConfigurationServiceException( e.getMessage(), e );
         }
-        
+
         return dirPurgeConfig;
     }
-    
+
     public RepositoryPurgeConfiguration addRepositoryPurgeConfiguration( RepositoryPurgeConfiguration repoPurge )
         throws PurgeConfigurationServiceException
     {
         RepositoryPurgeConfiguration repoPurgeConfig = null;
-        
+
         try
         {
-            repoPurgeConfig = store.addRepositoryPurgeConfiguration( repoPurge );
+            repoPurgeConfig = repositoryPurgeConfigurationDao.addRepositoryPurgeConfiguration( repoPurge );
         }
         catch ( ContinuumStoreException e )
         {
             throw new PurgeConfigurationServiceException( e.getMessage(), e );
         }
-        
+
         return repoPurgeConfig;
     }
-    
+
     public RepositoryPurgeConfiguration getDefaultPurgeConfigurationForRepository( int repositoryId )
     {
         List<RepositoryPurgeConfiguration> purgeConfigs = getRepositoryPurgeConfigurationsByRepository( repositoryId );
-        
+
         for ( RepositoryPurgeConfiguration purgeConfig : purgeConfigs )
         {
             if ( purgeConfig.isDefaultPurge() )
@@ -145,37 +157,38 @@
                 return purgeConfig;
             }
         }
-        
+
         return null;
     }
-    
+
     public List<DirectoryPurgeConfiguration> getAllDirectoryPurgeConfigurations()
     {
-        return store.getAllDirectoryPurgeConfigurations();
+        return directoryPurgeConfigurationDao.getAllDirectoryPurgeConfigurations();
     }
-    
+
     public List<RepositoryPurgeConfiguration> getAllRepositoryPurgeConfigurations()
     {
-        return store.getAllRepositoryPurgeConfigurations();
+        return repositoryPurgeConfigurationDao.getAllRepositoryPurgeConfigurations();
     }
-    
+
     public List<AbstractPurgeConfiguration> getAllPurgeConfigurations()
     {
         List<RepositoryPurgeConfiguration> repoPurge = getAllRepositoryPurgeConfigurations();
         List<DirectoryPurgeConfiguration> dirPurge = getAllDirectoryPurgeConfigurations();
-        
+
         List<AbstractPurgeConfiguration> allPurgeConfigs = new ArrayList<AbstractPurgeConfiguration>();
-        
+
         allPurgeConfigs.addAll( repoPurge );
         allPurgeConfigs.addAll( dirPurge );
-        
+
         return allPurgeConfigs;
     }
-    
+
     public DirectoryPurgeConfiguration getDefaultPurgeConfigurationForDirectoryType( String directoryType )
     {
-        List<DirectoryPurgeConfiguration> purgeConfigs = store.getDirectoryPurgeConfigurationsByType( directoryType );
-        
+        List<DirectoryPurgeConfiguration> purgeConfigs =
+            directoryPurgeConfigurationDao.getDirectoryPurgeConfigurationsByType( directoryType );
+
         for ( DirectoryPurgeConfiguration purgeConfig : purgeConfigs )
         {
             if ( purgeConfig.isDefaultPurge() )
@@ -183,88 +196,88 @@
                 return purgeConfig;
             }
         }
-        
+
         return null;
     }
-    
+
     public List<DirectoryPurgeConfiguration> getDirectoryPurgeConfigurationsByLocation( String location )
     {
-        return store.getDirectoryPurgeConfigurationsByLocation( location );
+        return directoryPurgeConfigurationDao.getDirectoryPurgeConfigurationsByLocation( location );
     }
-    
+
     public List<DirectoryPurgeConfiguration> getDirectoryPurgeConfigurationsBySchedule( int scheduleId )
     {
-        return store.getDirectoryPurgeConfigurationsBySchedule( scheduleId );
+        return directoryPurgeConfigurationDao.getDirectoryPurgeConfigurationsBySchedule( scheduleId );
     }
-    
+
     public List<RepositoryPurgeConfiguration> getRepositoryPurgeConfigurationsByRepository( int repositoryId )
     {
-        return store.getRepositoryPurgeConfigurationsByLocalRepository( repositoryId );
+        return repositoryPurgeConfigurationDao.getRepositoryPurgeConfigurationsByLocalRepository( repositoryId );
     }
-    
+
     public List<RepositoryPurgeConfiguration> getRepositoryPurgeConfigurationsBySchedule( int scheduleId )
     {
-        return store.getRepositoryPurgeConfigurationsBySchedule( scheduleId );
+        return repositoryPurgeConfigurationDao.getRepositoryPurgeConfigurationsBySchedule( scheduleId );
     }
-    
+
     public void removeDirectoryPurgeConfiguration( DirectoryPurgeConfiguration purgeConfig )
         throws PurgeConfigurationServiceException
     {
         try
         {
-            store.removeDirectoryPurgeConfiguration( purgeConfig );
+            directoryPurgeConfigurationDao.removeDirectoryPurgeConfiguration( purgeConfig );
         }
         catch ( ContinuumStoreException e )
         {
             throw new PurgeConfigurationServiceException( e.getMessage(), e );
         }
     }
-    
+
     public void removeRepositoryPurgeConfiguration( RepositoryPurgeConfiguration purgeConfig )
         throws PurgeConfigurationServiceException
     {
         try
         {
-            store.removeRepositoryPurgeConfiguration( purgeConfig );
+            repositoryPurgeConfigurationDao.removeRepositoryPurgeConfiguration( purgeConfig );
         }
         catch ( ContinuumStoreException e )
         {
             throw new PurgeConfigurationServiceException( e.getMessage(), e );
         }
     }
-    
+
     public void updateDirectoryPurgeConfiguration( DirectoryPurgeConfiguration purgeConfig )
         throws PurgeConfigurationServiceException
     {
         try
         {
-            store.updateDirectoryPurgeConfiguration( purgeConfig );
+            directoryPurgeConfigurationDao.updateDirectoryPurgeConfiguration( purgeConfig );
         }
         catch ( ContinuumStoreException e )
         {
             throw new PurgeConfigurationServiceException( e.getMessage(), e );
         }
     }
-    
+
     public void updateRepositoryPurgeConfiguration( RepositoryPurgeConfiguration purgeConfig )
         throws PurgeConfigurationServiceException
     {
         try
         {
-            store.updateRepositoryPurgeConfiguration( purgeConfig );
+            repositoryPurgeConfigurationDao.updateRepositoryPurgeConfiguration( purgeConfig );
         }
         catch ( ContinuumStoreException e )
         {
             throw new PurgeConfigurationServiceException( e.getMessage(), e );
         }
     }
-    
+
     public DirectoryPurgeConfiguration getDirectoryPurgeConfiguration( int purgeConfigId )
         throws PurgeConfigurationServiceException
     {
         try
         {
-            return store.getDirectoryPurgeConfiguration( purgeConfigId );
+            return directoryPurgeConfigurationDao.getDirectoryPurgeConfiguration( purgeConfigId );
         }
         catch ( ContinuumObjectNotFoundException e )
         {
@@ -275,13 +288,13 @@
             throw new PurgeConfigurationServiceException( e.getMessage(), e );
         }
     }
-    
+
     public RepositoryPurgeConfiguration getRepositoryPurgeConfiguration( int purgeConfigId )
         throws PurgeConfigurationServiceException
     {
         try
         {
-            return store.getRepositoryPurgeConfiguration( purgeConfigId );
+            return repositoryPurgeConfigurationDao.getRepositoryPurgeConfiguration( purgeConfigId );
         }
         catch ( ContinuumObjectNotFoundException e )
         {
@@ -292,11 +305,11 @@
             throw new PurgeConfigurationServiceException( e.getMessage(), e );
         }
     }
-    
+
     public AbstractPurgeConfiguration getPurgeConfiguration( int purgeConfigId )
     {
         AbstractPurgeConfiguration purgeConfig = null;
-        
+
         try
         {
             purgeConfig = getRepositoryPurgeConfiguration( purgeConfigId );
@@ -305,7 +318,7 @@
         {
             // purgeConfigId is not of type repository purge configuration
         }
-        
+
         if ( purgeConfig == null )
         {
             try
@@ -317,38 +330,42 @@
                 // purgeConfigId is not of type directory purge configuration
             }
         }
-        
+
         return purgeConfig;
     }
-    
+
     public RepositoryManagedContent getManagedRepositoryContent( int repositoryId )
         throws PurgeConfigurationServiceException
     {
         try
         {
-            LocalRepository repository = store.getLocalRepository( repositoryId );
-            
+            LocalRepository repository = localRepositoryDao.getLocalRepository( repositoryId );
+
             RepositoryManagedContent repoContent;
-            
-            repoContent = (RepositoryManagedContent) container.lookup( RepositoryManagedContent.class, repository.getLayout() );
+
+            repoContent =
+                (RepositoryManagedContent) container.lookup( RepositoryManagedContent.class, repository.getLayout() );
             repoContent.setRepository( repository );
-            
+
             return repoContent;
         }
         catch ( ContinuumObjectNotFoundException e )
         {
-            throw new PurgeConfigurationServiceException( "Error retrieving managed repository content for: " + repositoryId, e );
+            throw new PurgeConfigurationServiceException(
+                "Error retrieving managed repository content for: " + repositoryId, e );
         }
         catch ( ContinuumStoreException e )
         {
-            throw new PurgeConfigurationServiceException( "Error retrieving managed repository content for: " + repositoryId, e );
+            throw new PurgeConfigurationServiceException(
+                "Error retrieving managed repository content for: " + repositoryId, e );
         }
         catch ( ComponentLookupException e )
         {
-            throw new PurgeConfigurationServiceException( "Error retrieving managed repository content for: " + repositoryId, e );
+            throw new PurgeConfigurationServiceException(
+                "Error retrieving managed repository content for: " + repositoryId, e );
         }
     }
-    
+
     public void contextualize( Context context )
         throws ContextException
     {

Copied: continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java (from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java?p2=continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java&r1=682986&r2=683689&rev=683689&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java Thu Aug  7 12:38:49 2008
@@ -30,7 +30,7 @@
 
 /**
  * DirectoryPurgeController
- * 
+ *
  * @author Maria Catherine Tan
  * @plexus.component role="org.apache.continuum.purge.controller.PurgeController" role-hint="purge-directory"
  */
@@ -39,10 +39,10 @@
     implements PurgeController
 {
     private ContinuumPurgeExecutor purgeExecutor;
-    
-    public void doPurge( String path ) 
+
+    public void doPurge( String path )
     {
-        try 
+        try
         {
             purgeExecutor.purge( path );
         }
@@ -56,18 +56,20 @@
         throws ContinuumPurgeExecutorException
     {
         DirectoryPurgeConfiguration dirPurge = (DirectoryPurgeConfiguration) purgeConfig;
-        
+
         if ( dirPurge.isDeleteAll() )
         {
             purgeExecutor = new CleanAllPurgeExecutor( dirPurge.getDirectoryType() );
         }
         else if ( dirPurge.getDaysOlder() > 0 )
         {
-            purgeExecutor = new DaysOldDirectoryPurgeExecutor( dirPurge.getDaysOlder(), dirPurge.getRetentionCount(), dirPurge.getDirectoryType() );
+            purgeExecutor = new DaysOldDirectoryPurgeExecutor( dirPurge.getDaysOlder(), dirPurge.getRetentionCount(),
+                                                               dirPurge.getDirectoryType() );
         }
         else
         {
-            purgeExecutor = new RetentionCountDirectoryPurgeExecutor( dirPurge.getRetentionCount(), dirPurge.getDirectoryType() );
+            purgeExecutor =
+                new RetentionCountDirectoryPurgeExecutor( dirPurge.getRetentionCount(), dirPurge.getDirectoryType() );
         }
     }
 }

Copied: continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java (from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java?p2=continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java&r1=682986&r2=683689&rev=683689&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/controller/RepositoryPurgeController.java Thu Aug  7 12:38:49 2008
@@ -35,7 +35,7 @@
 
 /**
  * DefaultPurgeController
- * 
+ *
  * @author Maria Catherine Tan
  * @plexus.component role="org.apache.continuum.purge.controller.PurgeController" role-hint="purge-repository"
  */
@@ -44,61 +44,64 @@
     implements PurgeController
 {
     private ContinuumPurgeExecutor purgeExecutor;
-    
+
     private ContinuumPurgeExecutor purgeReleasedSnapshotsExecutor;
-    
+
     /**
      * @plexus.requirement
      */
     private PurgeConfigurationService purgeConfigurationService;
-    
+
     private boolean deleteReleasedSnapshots = false;
-    
+
     public void initializeExecutors( AbstractPurgeConfiguration purgeConfig )
         throws ContinuumPurgeExecutorException
     {
         RepositoryManagedContent repositoryContent;
-     
+
         RepositoryPurgeConfiguration repoPurge = (RepositoryPurgeConfiguration) purgeConfig;
-        
+
         try
         {
-            repositoryContent = purgeConfigurationService.getManagedRepositoryContent( repoPurge.getRepository().getId() );
+            repositoryContent =
+                purgeConfigurationService.getManagedRepositoryContent( repoPurge.getRepository().getId() );
         }
-        catch( PurgeConfigurationServiceException e )
+        catch ( PurgeConfigurationServiceException e )
         {
             throw new ContinuumPurgeExecutorException( "Error while initializing purge executors", e );
         }
-            
+
         if ( repoPurge.isDeleteAll() )
         {
             purgeExecutor = new CleanAllPurgeExecutor( ContinuumPurgeConstants.PURGE_REPOSITORY );
         }
-        else 
-        {    
+        else
+        {
             if ( repoPurge.getDaysOlder() > 0 )
             {
-                purgeExecutor = new DaysOldRepositoryPurgeExecutor( repositoryContent, repoPurge.getDaysOlder(), repoPurge.getRetentionCount() );
+                purgeExecutor = new DaysOldRepositoryPurgeExecutor( repositoryContent, repoPurge.getDaysOlder(),
+                                                                    repoPurge.getRetentionCount() );
             }
             else
             {
-                purgeExecutor = new RetentionCountRepositoryPurgeExecutor( repositoryContent, repoPurge.getRetentionCount() );
+                purgeExecutor =
+                    new RetentionCountRepositoryPurgeExecutor( repositoryContent, repoPurge.getRetentionCount() );
             }
-            
+
             purgeReleasedSnapshotsExecutor = new ReleasedSnapshotsRepositoryPurgeExecutor( repositoryContent );
             deleteReleasedSnapshots = repoPurge.isDeleteReleasedSnapshots();
         }
     }
-    
+
     public void doPurge( String path )
     {
-        try 
+        try
         {
-            if ( deleteReleasedSnapshots)
+            if ( deleteReleasedSnapshots )
             {
                 purgeReleasedSnapshotsExecutor.purge( path );
             }
-            
+
             purgeExecutor.purge( path );
         }
         catch ( ContinuumPurgeExecutorException e )

Copied: continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java (from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java?p2=continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java&r1=682986&r2=683689&rev=683689&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/AbstractContinuumPurgeExecutor.java Thu Aug  7 12:38:49 2008
@@ -19,16 +19,17 @@
  * under the License.
  */
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Set;
-
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.maven.archiva.consumers.core.repository.ArtifactFilenameFilter;
 import org.apache.maven.archiva.model.ArtifactReference;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Set;
+
 /**
  * Some codes were taken from Archiva.
+ *
  * @author Maria Catherine Tan
  */
 public abstract class AbstractContinuumPurgeExecutor
@@ -36,7 +37,7 @@
 {
     public void purge( Set<ArtifactReference> references, RepositoryManagedContent repository )
     {
-        if( references != null && !references.isEmpty() )
+        if ( references != null && !references.isEmpty() )
         {
             for ( ArtifactReference reference : references )
             {
@@ -48,7 +49,7 @@
             }
         }
     }
-    
+
     /**
      * <p>
      * This find support files for the artifactFile and deletes them.
@@ -56,7 +57,7 @@
      * <p>
      * Support Files are things like ".sha1", ".md5", ".asc", etc.
      * </p>
-     * 
+     *
      * @param artifactFile the file to base off of.
      */
     protected void purgeSupportFiles( File artifactFile, String filename )

Copied: continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java (from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java?p2=continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java&r1=682986&r2=683689&rev=683689&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/CleanAllPurgeExecutor.java Thu Aug  7 12:38:49 2008
@@ -19,16 +19,16 @@
  * under the License.
  */
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
-import java.io.IOException;
-
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.continuum.purge.ContinuumPurgeConstants;
 import org.apache.maven.archiva.consumers.core.repository.ArtifactFilenameFilter;
 import org.codehaus.plexus.util.FileUtils;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+
 /**
  * @author Maria Catherine Tan
  */
@@ -36,12 +36,12 @@
     extends AbstractContinuumPurgeExecutor
 {
     private String purgeType;
-    
+
     public CleanAllPurgeExecutor( String purgeType )
     {
         this.purgeType = purgeType;
     }
-    
+
     public void purge( String path )
         throws ContinuumPurgeExecutorException
     {
@@ -58,7 +58,7 @@
             purgeBuildOutput( path );
         }
     }
-    
+
     private void purgeRepository( String path )
         throws ContinuumPurgeExecutorException
     {
@@ -68,19 +68,20 @@
         }
         catch ( IOException e )
         {
-            throw new ContinuumPurgeExecutorException( "Error while purging all artifacts or directories in " + path, e );
+            throw new ContinuumPurgeExecutorException( "Error while purging all artifacts or directories in " + path,
+                                                       e );
         }
     }
-    
+
     private void purgeReleases( String path )
         throws ContinuumPurgeExecutorException
     {
         File workingDir = new File( path );
-        
+
         FilenameFilter filter = new ArtifactFilenameFilter( "releases-" );
-        
+
         File[] releasesDir = workingDir.listFiles( filter );
-        
+
         try
         {
             for ( File releaseDir : releasesDir )
@@ -93,16 +94,16 @@
             throw new ContinuumPurgeExecutorException( "Error while purging all releases directories", e );
         }
     }
-    
+
     private void purgeBuildOutput( String path )
         throws ContinuumPurgeExecutorException
     {
         File buildOutputDir = new File( path );
-        
+
         FileFilter filter = DirectoryFileFilter.DIRECTORY;
-        
+
         File[] projectsDir = buildOutputDir.listFiles( filter );
-     
+
         try
         {
             for ( File projectDir : projectsDir )

Copied: continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java (from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java?p2=continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java&r1=682986&r2=683689&rev=683689&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldDirectoryPurgeExecutor.java Thu Aug  7 12:38:49 2008
@@ -19,13 +19,6 @@
  * under the License.
  */
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Calendar;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.comparator.LastModifiedFileComparator;
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
@@ -33,6 +26,13 @@
 import org.apache.continuum.purge.ContinuumPurgeConstants;
 import org.apache.maven.archiva.consumers.core.repository.ArtifactFilenameFilter;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Calendar;
+
 /**
  * @author Maria Catherine Tan
  */
@@ -41,17 +41,17 @@
     implements ContinuumPurgeExecutor
 {
     private int daysOlder;
-    
+
     private int retentionCount;
-    
+
     private String directoryType;
-    
+
     public DaysOldDirectoryPurgeExecutor( int daysOlder, int retentionCount, String directoryType )
     {
         this.daysOlder = daysOlder;
-        
+
         this.retentionCount = retentionCount;
-        
+
         this.directoryType = directoryType;
     }
 
@@ -67,34 +67,34 @@
             purgeBuildOutputDirectory( path );
         }
     }
-    
+
     private void purgeReleaseDirectory( String path )
     {
         File releaseDir = new File( path );
-        
+
         FilenameFilter filter = new ArtifactFilenameFilter( "releases-" );
-            
+
         File[] releasesDir = releaseDir.listFiles( filter );
-            
+
         if ( retentionCount > releasesDir.length )
         {
             return;
         }
-        
+
         Arrays.sort( releasesDir, LastModifiedFileComparator.LASTMODIFIED_COMPARATOR );
-            
+
         Calendar olderThanThisDate = Calendar.getInstance( DateUtils.UTC_TIME_ZONE );
         olderThanThisDate.add( Calendar.DATE, -daysOlder );
-        
+
         int countToPurge = releasesDir.length - retentionCount;
-        
+
         for ( File dir : releasesDir )
         {
             if ( countToPurge <= 0 )
             {
                 break;
             }
-            
+
             if ( dir.lastModified() < olderThanThisDate.getTimeInMillis() )
             {
                 try
@@ -109,50 +109,50 @@
             }
         }
     }
-    
+
     private void purgeBuildOutputDirectory( String path )
     {
         File buildOutputDir = new File( path );
-        
+
         FileFilter filter = DirectoryFileFilter.DIRECTORY;
-        
+
         File[] projectsDir = buildOutputDir.listFiles( filter );
-        
+
         for ( File projectDir : projectsDir )
         {
             File[] buildsDir = projectDir.listFiles( filter );
-            
+
             if ( retentionCount > buildsDir.length )
             {
                 continue;
             }
-            
+
             int countToPurge = buildsDir.length - retentionCount;
-            
+
             Calendar olderThanThisDate = Calendar.getInstance( DateUtils.UTC_TIME_ZONE );
             olderThanThisDate.add( Calendar.DATE, -daysOlder );
-            
+
             Arrays.sort( buildsDir, LastModifiedFileComparator.LASTMODIFIED_COMPARATOR );
-            
+
             for ( File buildDir : buildsDir )
             {
                 if ( countToPurge <= 0 )
                 {
                     break;
                 }
-                
+
                 if ( buildDir.lastModified() < olderThanThisDate.getTimeInMillis() )
                 {
                     try
                     {
                         FileUtils.deleteDirectory( buildDir );
-                        File logFile = new File ( buildDir.getAbsoluteFile() + ".log.txt" );
-                        
+                        File logFile = new File( buildDir.getAbsoluteFile() + ".log.txt" );
+
                         if ( logFile.exists() )
                         {
-                            logFile.delete();   
+                            logFile.delete();
                         }
-                        
+
                         countToPurge--;
                     }
                     catch ( IOException e )

Copied: continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java (from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java?p2=continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java&r1=682986&r2=683689&rev=683689&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/DaysOldRepositoryPurgeExecutor.java Thu Aug  7 12:38:49 2008
@@ -19,6 +19,15 @@
  * under the License.
  */
 
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
+import org.apache.maven.archiva.common.utils.VersionComparator;
+import org.apache.maven.archiva.common.utils.VersionUtil;
+import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.maven.archiva.repository.ContentNotFoundException;
+import org.apache.maven.archiva.repository.layout.LayoutException;
+
 import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -30,18 +39,9 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 
-import org.apache.commons.lang.time.DateUtils;
-import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
-import org.apache.maven.archiva.common.utils.VersionComparator;
-import org.apache.maven.archiva.common.utils.VersionUtil;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.VersionedReference;
-import org.apache.maven.archiva.repository.ContentNotFoundException;
-import org.apache.maven.archiva.repository.layout.LayoutException;
-
 /**
  * Codes were taken from  Archiva's DaysOldRepositoryPurge and made some few changes.
- * 
+ *
  * @author Maria Catherine Tan
  */
 public class DaysOldRepositoryPurgeExecutor
@@ -49,13 +49,13 @@
     implements ContinuumPurgeExecutor
 {
     private int daysOlder;
-    
+
     private int retentionCount;
-    
+
     private RepositoryManagedContent repository;
-    
+
     private SimpleDateFormat timestampParser;
-    
+
     public DaysOldRepositoryPurgeExecutor( RepositoryManagedContent repository, int daysOlder, int retentionCount )
     {
         this.repository = repository;
@@ -64,55 +64,55 @@
         timestampParser = new SimpleDateFormat( "yyyyMMdd.HHmmss" );
         timestampParser.setTimeZone( DateUtils.UTC_TIME_ZONE );
     }
-    
+
     public void purge( String path )
         throws ContinuumPurgeExecutorException
     {
         try
         {
             File artifactFile = new File( repository.getRepoRoot(), path );
-    
+
             if ( !artifactFile.exists() )
             {
                 return;
             }
-    
+
             ArtifactReference artifact = repository.toArtifactReference( path );
-    
+
             Calendar olderThanThisDate = Calendar.getInstance( DateUtils.UTC_TIME_ZONE );
             olderThanThisDate.add( Calendar.DATE, -daysOlder );
-    
+
             // respect retention count
             VersionedReference reference = new VersionedReference();
             reference.setGroupId( artifact.getGroupId() );
             reference.setArtifactId( artifact.getArtifactId() );
             reference.setVersion( artifact.getVersion() );
-    
+
             List<String> versions = new ArrayList<String>( repository.getVersions( reference ) );
-    
+
             Collections.sort( versions, VersionComparator.getInstance() );
-    
+
             if ( retentionCount > versions.size() )
             {
                 // Done. nothing to do here. skip it.
                 return;
             }
-    
+
             int countToPurge = versions.size() - retentionCount;
-    
+
             for ( String version : versions )
             {
                 if ( countToPurge <= 0 )
                 {
                     break;
                 }
-    
+
                 ArtifactReference newArtifactReference =
                     repository.toArtifactReference( artifactFile.getAbsolutePath() );
                 newArtifactReference.setVersion( version );
-    
+
                 File newArtifactFile = repository.toFile( newArtifactReference );
-    
+
                 // Is this a generic snapshot "1.0-SNAPSHOT" ?
                 if ( VersionUtil.isGenericSnapshot( newArtifactReference.getVersion() ) )
                 {
@@ -126,7 +126,7 @@
                 else if ( VersionUtil.isUniqueSnapshot( newArtifactReference.getVersion() ) )
                 {
                     Calendar timestampCal = uniqueSnapshotToCalendar( newArtifactReference.getVersion() );
-    
+
                     if ( timestampCal.getTimeInMillis() < olderThanThisDate.getTimeInMillis() )
                     {
                         doPurgeAllRelated( newArtifactReference );
@@ -149,12 +149,12 @@
             throw new ContinuumPurgeExecutorException( e.getMessage(), e );
         }
     }
-    
+
     private Calendar uniqueSnapshotToCalendar( String version )
     {
         // The latestVersion will contain the full version string "1.0-alpha-5-20070821.213044-8"
         // This needs to be broken down into ${base}-${timestamp}-${build_number}
-    
+
         Matcher m = VersionUtil.UNIQUE_SNAPSHOT_PATTERN.matcher( version );
         if ( m.matches() )
         {
@@ -163,14 +163,14 @@
             {
                 String tsDate = mtimestamp.group( 1 );
                 String tsTime = mtimestamp.group( 2 );
-    
+
                 Date versionDate;
                 try
                 {
                     versionDate = timestampParser.parse( tsDate + "." + tsTime );
                     Calendar cal = Calendar.getInstance( DateUtils.UTC_TIME_ZONE );
                     cal.setTime( versionDate );
-    
+
                     return cal;
                 }
                 catch ( ParseException e )
@@ -182,7 +182,7 @@
         }
         return null;
     }
-    
+
     private void doPurgeAllRelated( ArtifactReference reference )
         throws LayoutException
     {

Copied: continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java (from r682986, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java?p2=continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java&r1=682986&r2=683689&rev=683689&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java (original)
+++ continuum/branches/continuum-refactoring-evenisse/continuum-purge/src/main/java/org/apache/continuum/purge/executor/ReleasedSnapshotsRepositoryPurgeExecutor.java Thu Aug  7 12:38:49 2008
@@ -19,11 +19,6 @@
  * under the License.
  */
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
 import org.apache.maven.archiva.common.utils.VersionComparator;
 import org.apache.maven.archiva.common.utils.VersionUtil;
@@ -33,55 +28,60 @@
 import org.apache.maven.archiva.repository.ContentNotFoundException;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Codes were taken from Archiva's CleanupReleasedSnapshotsRepositoryPurge and just made some few changes
- * 
+ *
  * @author Maria Catherine Tan
  */
 public class ReleasedSnapshotsRepositoryPurgeExecutor
     extends AbstractContinuumPurgeExecutor
 {
     private RepositoryManagedContent repository;
-    
+
     public ReleasedSnapshotsRepositoryPurgeExecutor( RepositoryManagedContent repository )
     {
         this.repository = repository;
     }
-    
+
     public void purge( String path )
         throws ContinuumPurgeExecutorException
     {
         try
         {
             File artifactFile = new File( repository.getRepoRoot(), path );
-    
+
             if ( !artifactFile.exists() )
             {
                 // Nothing to do here, file doesn't exist, skip it.
                 return;
             }
-    
+
             ArtifactReference artifact = repository.toArtifactReference( path );
-    
+
             if ( !VersionUtil.isSnapshot( artifact.getVersion() ) )
             {
                 // Nothing to do here, not a snapshot, skip it.
                 return;
             }
-    
+
             ProjectReference reference = new ProjectReference();
             reference.setGroupId( artifact.getGroupId() );
             reference.setArtifactId( artifact.getArtifactId() );
-            
+
             // Gather up all of the versions.
             List<String> allVersions = new ArrayList<String>( repository.getVersions( reference ) );
-            
+
             // Split the versions into released and snapshots.
             List<String> releasedVersions = new ArrayList<String>();
             List<String> snapshotVersions = new ArrayList<String>();
-    
+
             for ( String version : allVersions )
-            {   
+            {
                 if ( VersionUtil.isSnapshot( version ) )
                 {
                     snapshotVersions.add( version );
@@ -91,22 +91,22 @@
                     releasedVersions.add( version );
                 }
             }
-    
+
             Collections.sort( allVersions, VersionComparator.getInstance() );
             Collections.sort( releasedVersions, VersionComparator.getInstance() );
             Collections.sort( snapshotVersions, VersionComparator.getInstance() );
-            
+
             VersionedReference versionRef = new VersionedReference();
             versionRef.setGroupId( artifact.getGroupId() );
             versionRef.setArtifactId( artifact.getArtifactId() );
-            
+
             for ( String version : snapshotVersions )
-            {   
-                if( releasedVersions.contains( VersionUtil.getReleaseVersion( version ) ) )
-                {                    
+            {
+                if ( releasedVersions.contains( VersionUtil.getReleaseVersion( version ) ) )
+                {
                     versionRef.setVersion( version );
                     repository.deleteVersion( versionRef );
-                    
+
                     removeMetadata( versionRef );
                 }
             }
@@ -120,15 +120,15 @@
             throw new ContinuumPurgeExecutorException( e.getMessage(), e );
         }
     }
-    
+
     private void removeMetadata( VersionedReference versionRef )
         throws ContinuumPurgeExecutorException
     {
         String path = repository.toMetadataPath( versionRef );
         File projectPath = new File( repository.getRepoRoot(), path );
-        
+
         File projectDir = projectPath.getParentFile();
-        
+
         purgeSupportFiles( projectDir, "maven-metadata" );
     }
 }
\ No newline at end of file



Mime
View raw message