You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ha...@apache.org on 2007/03/14 20:40:41 UTC
svn commit: r518292 - in /maven/continuum/trunk: ./
continuum-core/src/main/java/org/apache/maven/continuum/core/action/
continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/
continuum-core/src/main/resources/META-INF/plexus/ continuum-not...
Author: handyande
Date: Wed Mar 14 12:40:40 2007
New Revision: 518292
URL: http://svn.apache.org/viewvc?view=rev&rev=518292
Log:
That should be continuum working on the latest container too, though there may still be a few role-hint tweaks needed
Modified:
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
maven/continuum/trunk/pom.xml
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java?view=diff&rev=518292&r1=518291&r2=518292
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java Wed Mar 14 12:40:40 2007
@@ -43,7 +43,7 @@
{
/**
- * @plexus.requirement
+ * @plexus.requirement role-hint="jdo"
*/
ContinuumStore store;
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java?view=diff&rev=518292&r1=518291&r2=518292
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java Wed Mar 14 12:40:40 2007
@@ -50,7 +50,7 @@
private ActionManager actionManager;
/**
- * @plexus.requirement
+ * @plexus.requirement role-hint="jdo"
*/
private ContinuumStore store;
Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=518292&r1=518291&r2=518292
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml Wed Mar 14 12:40:40 2007
@@ -33,6 +33,7 @@
</requirement>
<requirement>
<role>org.apache.maven.continuum.store.ContinuumStore</role>
+ <role-hint>jdo</role-hint>
</requirement>
</requirements>
<configuration>
Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java?view=diff&rev=518292&r1=518291&r2=518292
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java Wed Mar 14 12:40:40 2007
@@ -50,7 +50,7 @@
// ----------------------------------------------------------------------
/**
- * @plexus.requirement
+ * @plexus.requirement role-hint="jdo"
*/
private ContinuumStore store;
Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java?view=diff&rev=518292&r1=518291&r2=518292
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java Wed Mar 14 12:40:40 2007
@@ -61,7 +61,7 @@
private ConfigurationService configurationService;
/**
- * @plexus.requirement
+ * @plexus.requirement role-hint="jdo"
*/
private ContinuumStore store;
Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java?view=diff&rev=518292&r1=518291&r2=518292
==============================================================================
--- maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java (original)
+++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java Wed Mar 14 12:40:40 2007
@@ -61,7 +61,7 @@
private ConfigurationService configurationService;
/**
- * @plexus.requirement
+ * @plexus.requirement="jdo"
*/
private ContinuumStore store;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?view=diff&rev=518292&r1=518291&r2=518292
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Wed Mar 14 12:40:40 2007
@@ -64,12 +64,12 @@
}
/**
- * @plexus.requirement
+ * @plexus.requirement role-hint="jdo"
*/
private UserManager manager;
/**
- * @plexus.requirement
+ * @plexus.requirement role-hint="jdo"
*/
private RBACManager rbac;
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java?view=diff&rev=518292&r1=518291&r2=518292
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java Wed Mar 14 12:40:40 2007
@@ -46,7 +46,7 @@
implements Preparable, SecureAction
{
/**
- * @plexus.requirement
+ * @plexus.requirement role-hint="jdo"
*/
private ContinuumStore store;
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=518292&r1=518291&r2=518292
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Wed Mar 14 12:40:40 2007
@@ -120,6 +120,7 @@
</requirement>
<requirement>
<role>org.apache.maven.continuum.store.ContinuumStore</role>
+ <role-hint>jdo</role-hint>
</requirement>
<requirement>
<role>org.codehaus.plexus.mailsender.MailSender</role>
@@ -174,6 +175,7 @@
</requirement>
<requirement>
<role>org.apache.maven.continuum.store.ContinuumStore</role>
+ <role-hint>jdo</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.continuum.configuration.ConfigurationService</role>
@@ -205,6 +207,7 @@
</requirement>
<requirement>
<role>org.apache.maven.continuum.store.ContinuumStore</role>
+ <role-hint>jdo</role-hint>
</requirement>
</requirements>
<configuration>
@@ -238,6 +241,7 @@
</requirement>
<requirement>
<role>org.apache.maven.continuum.store.ContinuumStore</role>
+ <role-hint>jdo</role-hint>
</requirement>
</requirements>
<configuration>
Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=518292&r1=518291&r2=518292
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Wed Mar 14 12:40:40 2007
@@ -141,12 +141,12 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
- <version>1.0-alpha-18</version>
+ <version>1.0-alpha-19</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-18</version>
+ <version>1.0-alpha-19</version>
</dependency>
</dependencies>
<dependencyManagement>