You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by oc...@apache.org on 2009/01/16 19:13:11 UTC
svn commit: r735074 - in /continuum/trunk/continuum-store: ./
src/main/java/org/apache/continuum/dao/
Author: oching
Date: Fri Jan 16 10:13:10 2009
New Revision: 735074
URL: http://svn.apache.org/viewvc?rev=735074&view=rev
Log:
[CONTINUUM-2013]
submitted by Jan Ancajas
-added back plexus annotations in continuum-store module because the components cannot be looked up in dd migration tool
Modified:
continuum/trunk/continuum-store/pom.xml
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java
continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java
Modified: continuum/trunk/continuum-store/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/pom.xml?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/pom.xml (original)
+++ continuum/trunk/continuum-store/pom.xml Fri Jan 16 10:13:10 2009
@@ -85,6 +85,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/AbstractDao.java Fri Jan 16 10:13:10 2009
@@ -60,6 +60,9 @@
protected static final String PROJECT_WITH_SCM_DETAILS_FETCH_GROUP = "project-with-scm-details";
+ /**
+ * @plexus.requirement
+ */
@Resource
private StoreUtilities storeUtilities;
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -51,10 +51,16 @@
implements BuildDefinitionDao
{
private Logger log = LoggerFactory.getLogger( BuildDefinitionDaoImpl.class );
-
+
+ /**
+ * @plexus.requirement role="org.apache.continuum.dao.ProjectDao"
+ */
@Resource
private ProjectDao projectDao;
+ /**
+ * @plexus.requirement role="org.apache.continuum.dao.ProjectGroupDao"
+ */
@Resource
private ProjectGroupDao projectGroupDao;
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildDefinitionTemplateDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -33,6 +33,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.BuildDefinitionTemplateDao"
*/
@Repository("buildDefinitionTemplateDao")
public class BuildDefinitionTemplateDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildQueueDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -37,6 +37,7 @@
/**
*
* @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
+ * @plexus.component role="org.apache.continuum.dao.BuildQueueDao"
*/
@Repository("buildQueueDao")
public class BuildQueueDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/BuildResultDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -38,6 +38,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.BuildResultDao"
*/
@Repository("buildResultDao")
public class BuildResultDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -34,6 +34,7 @@
/**
* @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
+ * @plexus.component role="org.apache.continuum.dao.ContinuumReleaseResultDao"
*/
@Repository("continuumReleaseResultDao")
public class ContinuumReleaseResultDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java Fri Jan 16 10:13:10 2009
@@ -59,12 +59,16 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.DaoUtils"
*/
@Repository("daoUtils")
public class DaoUtilsImpl
extends AbstractDao
implements DaoUtils
{
+ /**
+ * @plexus.requirement role="org.apache.continuum.dao.ProjectDao"
+ */
@Resource
private ProjectDao projectDao;
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -33,6 +33,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.DirectoryPurgeConfigurationDao"
*/
@Repository("directoryPurgeConfigurationDao")
public class DirectoryPurgeConfigurationDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/InstallationDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -37,6 +37,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.InstallationDao"
*/
@Repository("installationDao")
public class InstallationDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/LocalRepositoryDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -34,6 +34,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.LocalRepositoryDao"
*/
@Repository("localRepositoryDao")
public class LocalRepositoryDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProfileDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -33,6 +33,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.ProfileDao"
*/
@Repository("profileDao")
public class ProfileDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -36,6 +36,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.ProjectDao"
*/
@Repository("projectDao")
public class ProjectDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectGroupDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -39,12 +39,16 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.ProjectGroupDao"
*/
@Repository("projectGroupDao")
public class ProjectGroupDaoImpl
extends AbstractDao
implements ProjectGroupDao
{
+ /**
+ * @plexus.requirement role=org.apache.continuum.dao.ProjectDao"
+ */
@Resource
private ProjectDao projectDao;
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ProjectScmRootDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -35,6 +35,7 @@
/**
* @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
* @version $Id: $
+ * @plexus.component role="org.apache.continuum.dao.ProjectScmRootDao"
*/
@Repository("projectScmRootDao")
public class ProjectScmRootDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -33,6 +33,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.RepositoryPurgeConfigurationDao"
*/
@Repository("repositoryPurgeConfigurationDao")
public class RepositoryPurgeConfigurationDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/ScheduleDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -33,6 +33,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.ScheduleDao"
*/
@Repository("scheduleDao")
public class ScheduleDaoImpl
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/StoreUtilities.java Fri Jan 16 10:13:10 2009
@@ -28,6 +28,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.StoreUtilities"
*/
@Service("storeUtilities")
public class StoreUtilities
Modified: continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java?rev=735074&r1=735073&r2=735074&view=diff
==============================================================================
--- continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java (original)
+++ continuum/trunk/continuum-store/src/main/java/org/apache/continuum/dao/SystemConfigurationDaoImpl.java Fri Jan 16 10:13:10 2009
@@ -28,6 +28,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
+ * @plexus.component role="org.apache.continuum.dao.SystemConfigurationDao"
*/
@Repository("systemConfigurationDao")
public class SystemConfigurationDaoImpl