You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/12/24 13:53:52 UTC
svn commit: r729304 - in /continuum/trunk/continuum-commons/src/main: java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java java/org/apache/maven/continuum/utils/ContinuumUrlValidator.java resources/META-INF/spring-context.xml

Author: olamy
Date: Wed Dec 24 04:53:52 2008
New Revision: 729304

URL: http://svn.apache.org/viewvc?rev=729304&view=rev
Log:
[CONTINUUM-2026] use annotations


Modified:
    continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java
    continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ContinuumUrlValidator.java
    continuum/trunk/continuum-commons/src/main/resources/META-INF/spring-context.xml

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java?rev=729304&r1=729303&r2=729304&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java (original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ChrootJailWorkingDirectoryService.java Wed Dec 24 04:53:52 2008
@@ -25,12 +25,13 @@
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.springframework.stereotype.Service;
 
 /**
  * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
  * @version $Id$
- * @plexus.component role="org.apache.maven.continuum.utils.WorkingDirectoryService" role-hint="chrootJail"
  */
+@Service("workingDirectoryService#chrootJail")
 public class ChrootJailWorkingDirectoryService
     extends AbstractLogEnabled
     implements WorkingDirectoryService

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ContinuumUrlValidator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ContinuumUrlValidator.java?rev=729304&r1=729303&r2=729304&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ContinuumUrlValidator.java (original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/utils/ContinuumUrlValidator.java Wed Dec 24 04:53:52 2008
@@ -29,6 +29,7 @@
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.configuration.PlexusConfigurationException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Configurable;
+import org.springframework.stereotype.Service;
 
 /**
  * @author <a href="mailto:olamy@apache.org">olamy</a>
@@ -37,6 +38,7 @@
  * @plexus.component role="org.apache.maven.continuum.utils.ContinuumUrlValidator"
  *   role-hint="continuumUrl"
  */
+@Service("continuumUrlValidator#continuumUrl")
 public class ContinuumUrlValidator
     implements Configurable
 {

Modified: continuum/trunk/continuum-commons/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/resources/META-INF/spring-context.xml?rev=729304&r1=729303&r2=729304&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/trunk/continuum-commons/src/main/resources/META-INF/spring-context.xml Wed Dec 24 04:53:52 2008
@@ -34,6 +34,5 @@
   <bean id="configurationService" class="org.apache.maven.continuum.configuration.DefaultConfigurationService"
         init-method="initialize">
     <property name="applicationHome" value="data"/>
-  </bean>
-  <bean id="shellCommandHelper" class="org.apache.continuum.utils.shell.DefaultShellCommandHelper"/>  
+  </bean> 
 </beans>
\ No newline at end of file