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/27 18:34:31 UTC
svn commit: r729645 - in /continuum/trunk/continuum-notifiers:
continuum-notifier-api/
continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/
continuum-notifier-api/src/main/resources/
continuum-notifier-api/src/main/resources/ME...
Author: olamy
Date: Sat Dec 27 09:34:30 2008
New Revision: 729645
URL: http://svn.apache.org/viewvc?rev=729645&view=rev
Log:
[CONTINUUM-2026] Use annotations instead of plexus-maven-plugin
Added:
continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/
continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/
continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/spring-context.xml (with props)
continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/
continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/
continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/spring-context.xml (with props)
continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/
continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/
continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/spring-context.xml (with props)
continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/
continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/
continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/spring-context.xml (with props)
continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/
continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/
continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/spring-context.xml (with props)
Modified:
continuum/trunk/continuum-notifiers/continuum-notifier-api/pom.xml
continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java
continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml
continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml
continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml
continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml
continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-api/pom.xml?rev=729645&r1=729644&r2=729645&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-api/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-api/pom.xml Sat Dec 27 09:34:30 2008
@@ -31,5 +31,13 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java?rev=729645&r1=729644&r2=729645&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java Sat Dec 27 09:34:30 2008
@@ -40,6 +40,8 @@
import java.util.List;
+import javax.annotation.Resource;
+
public abstract class AbstractContinuumNotifier
implements Notifier
{
@@ -49,29 +51,18 @@
private Logger log = LoggerFactory.getLogger( getClass() );
- /**
- * @plexus.requirement
- */
+ @Resource
private ConfigurationService configurationService;
- /**
- * @plexus.requirement
- */
+ @Resource
private BuildResultDao buildResultDao;
- /**
- * @plexus.requirement
- */
+ @Resource
private ProjectDao projectDao;
- /**
- * @plexus.requirement
- */
+ @Resource
private ProjectScmRootDao projectScmRootDao;
- /**
- * @plexus.configuration
- */
private boolean alwaysSend = false;
protected String getBuildOutput( Project project, BuildResult buildResult )
Added: continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/spring-context.xml?rev=729645&view=auto
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/spring-context.xml (added)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/spring-context.xml Sat Dec 27 09:34:30 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+ <context:annotation-config />
+ <context:component-scan base-package="org.apache.maven.continuum.notification"/>
+
+</beans>
\ No newline at end of file
Propchange: continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml?rev=729645&r1=729644&r2=729645&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml Sat Dec 27 09:34:30 2008
@@ -37,21 +37,13 @@
<artifactId>continuum-notifier-api</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java?rev=729645&r1=729644&r2=729645&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java Sat Dec 27 09:34:30 2008
@@ -40,6 +40,7 @@
import org.schwering.irc.lib.ssl.SSLIRCConnection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
import java.io.IOException;
import java.util.ArrayList;
@@ -47,13 +48,16 @@
import java.util.List;
import java.util.Map;
+import javax.annotation.Resource;
+
/**
* <b>This implementation assumes there aren't concurrent acces to the IRCConnection</b>
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
- * @plexus.component role="org.apache.maven.continuum.notification.Notifier" role-hint="irc"
+ *
*/
+@Service("notifier#irc")
public class IrcContinuumNotifier
extends AbstractContinuumNotifier
implements Disposable
@@ -64,15 +68,10 @@
// Requirements
// ----------------------------------------------------------------------
- /**
- * @plexus.requirement
- */
+ @Resource
private ConfigurationService configurationService;
- /**
- * @plexus.configuration default-value="6667"
- */
- private int defaultPort;
+ private int defaultPort = 6667;
/**
* key is upper(hostname) + port + upper(nick) + upper(alternateNick)
Added: continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/spring-context.xml?rev=729645&view=auto
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/spring-context.xml (added)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/spring-context.xml Sat Dec 27 09:34:30 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+ <context:annotation-config />
+ <context:component-scan base-package="org.apache.maven.continuum.notification.irc"/>
+
+</beans>
\ No newline at end of file
Propchange: continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=729645&r1=729644&r2=729645&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml Sat Dec 27 09:34:30 2008
@@ -33,6 +33,14 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-jabber</artifactId>
<version>1.0-alpha-4</version>
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java?rev=729645&r1=729644&r2=729645&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java Sat Dec 27 09:34:30 2008
@@ -34,15 +34,19 @@
import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import javax.annotation.Resource;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
+@Service("notifier#jabber")
public class JabberContinuumNotifier
extends AbstractContinuumNotifier
{
@@ -52,14 +56,10 @@
// Requirements
// ----------------------------------------------------------------------
- /**
- * @plexus.requirement
- */
+ @Resource
private JabberClient jabberClient;
- /**
- * @plexus.requirement
- */
+ @Resource
private ConfigurationService configurationService;
// ----------------------------------------------------------------------
Added: continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/spring-context.xml?rev=729645&view=auto
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/spring-context.xml (added)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/spring-context.xml Sat Dec 27 09:34:30 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+ <context:annotation-config />
+ <context:component-scan base-package="org.apache.maven.continuum.notification.jabber"/>
+
+</beans>
\ No newline at end of file
Propchange: continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml?rev=729645&r1=729644&r2=729645&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml Sat Dec 27 09:34:30 2008
@@ -43,5 +43,13 @@
<artifactId>continuum-notifier-api</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java?rev=729645&r1=729644&r2=729645&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java Sat Dec 27 09:34:30 2008
@@ -34,15 +34,19 @@
import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import javax.annotation.Resource;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
+@Service("notifier#msn")
public class MsnContinuumNotifier
extends AbstractContinuumNotifier
{
@@ -52,14 +56,10 @@
// Requirements
// ----------------------------------------------------------------------
- /**
- * @plexus.requirement
- */
+ @Resource
private MsnClient msnClient;
- /**
- * @plexus.requirement
- */
+ @Resource
private ConfigurationService configurationService;
// ----------------------------------------------------------------------
Added: continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/spring-context.xml?rev=729645&view=auto
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/spring-context.xml (added)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/spring-context.xml Sat Dec 27 09:34:30 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+ <context:annotation-config />
+ <context:component-scan base-package="org.apache.maven.continuum.notification.msn"/>
+
+</beans>
\ No newline at end of file
Propchange: continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml?rev=729645&r1=729644&r2=729645&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml Sat Dec 27 09:34:30 2008
@@ -50,6 +50,14 @@
<artifactId>plexus-component-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-test</artifactId>
<scope>test</scope>
@@ -83,17 +91,6 @@
<argLine>-noverify</argLine>
</configuration>
</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-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java?rev=729645&r1=729644&r2=729645&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java Sat Dec 27 09:34:30 2008
@@ -67,17 +67,20 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Map;
+import javax.annotation.Resource;
+
/**
* @author <a href="mailto:hisidro@exist.com">Henry Isidro</a>
* @author <a href="mailto:nramirez@exist.com">Napoleon Esmundo C. Ramirez</a>
- * @plexus.component role="org.apache.maven.continuum.notification.Notifier" role-hint="wagon"
*/
+@Service("notifier#wagon")
public class WagonContinuumNotifier
extends AbstractContinuumNotifier
implements Contextualizable
@@ -88,24 +91,16 @@
private Logger log = LoggerFactory.getLogger( getClass() );
- /**
- * @plexus.requirement
- */
+ @Resource
private ConfigurationService configurationService;
- /**
- * @plexus.requirement
- */
+ @Resource
private WagonManager wagonManager;
- /**
- * @plexus.requirement
- */
+ @Resource
private MavenProjectBuilder projectBuilder;
- /**
- * @plexus.requirement
- */
+ @Resource
private MavenSettingsBuilder settingsBuilder;
/**
Added: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/spring-context.xml?rev=729645&view=auto
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/spring-context.xml (added)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/spring-context.xml Sat Dec 27 09:34:30 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+ <context:annotation-config />
+ <context:component-scan base-package="org.apache.maven.continuum.notification.wagon"/>
+
+</beans>
\ No newline at end of file
Propchange: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision