Author: rdonkin
Date: Thu Dec 11 12:40:18 2008
New Revision: 725806
URL: http://svn.apache.org/viewvc?rev=725806&view=rev
Log:
Add JSR250 (common annotations) and annotate injection on SieveMailet.
Added:
james/server/trunk/stage/org.apache.geronimo.specs/jars/geronimo-annotation_1.0_spec-1.1.jar
(with props)
Modified:
james/server/trunk/build-tools/common-build.xml
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/SieveMailet.java
james/server/trunk/include.properties
james/server/trunk/phoenix-deployment/build.xml
james/server/trunk/spring-deployment/build.xml
james/server/trunk/stage/org.apache.james/jars/apache-jsieve-mailet-0.3-SNAPSHOT.jar
Modified: james/server/trunk/build-tools/common-build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/build-tools/common-build.xml?rev=725806&r1=725805&r2=725806&view=diff
==============================================================================
--- james/server/trunk/build-tools/common-build.xml (original)
+++ james/server/trunk/build-tools/common-build.xml Thu Dec 11 12:40:18 2008
@@ -235,7 +235,8 @@
<include name="${jcr.jar}"/>
<include name="${spring.jar}"/>
<include name="${log4j.jar}"/>
- <include name="${avalon-phoenix.jar}"/>
+ <include name="${avalon-phoenix.jar}"/>
+ <include name="${jsr250.jar}"/>
<include name='${path.lib.james}/apache-james-imap*.jar'/>
</fileset>
</path>
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/SieveMailet.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/SieveMailet.java?rev=725806&r1=725805&r2=725806&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/SieveMailet.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/SieveMailet.java
Thu Dec 11 12:40:18 2008
@@ -19,30 +19,19 @@
package org.apache.james.imapserver.sieve;
-import javax.mail.MessagingException;
+import javax.annotation.Resource;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.james.Constants;
import org.apache.jsieve.mailet.Poster;
import org.apache.jsieve.mailet.SieveMailboxMailet;
/**
- * Contains avalon bindings.
+ * Contains resource bindings.
*/
public class SieveMailet extends SieveMailboxMailet {
+ @Resource(name="imapserver")
@Override
- public void init() throws MessagingException {
-
- ServiceManager compMgr =
(ServiceManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
- try {
- Poster poster = (Poster)
compMgr.lookup("org.apache.jsieve.mailet.Poster");
- setPoster(poster);
- } catch (ServiceException e) {
- throw new MessagingException("IMAP not installed", e);
- }
-
- super.init();
- }
+ public void setPoster(Poster poster) {
+ super.setPoster(poster);
+ }
}
Modified: james/server/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=725806&r1=725805&r2=725806&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Thu Dec 11 12:40:18 2008
@@ -131,6 +131,10 @@
# ----- From lib
+# JSR 250 Annotations
+jarname.geronimo.annotations=geronimo-annotation_1.0_spec-1.1.jar
+jsr250.jar=${path.lib.geronimo.specs}/${jarname.geronimo.annotations}
+
# ----- Excalibur datasource -----
jarname.excalibur-datasource.jar=excalibur-datasource-2.2.2.jar
excalibur-datasource.jar=${path.lib.excaliburdatasource}/${jarname.excalibur-datasource.jar}
Modified: james/server/trunk/phoenix-deployment/build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?rev=725806&r1=725805&r2=725806&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/build.xml (original)
+++ james/server/trunk/phoenix-deployment/build.xml Thu Dec 11 12:40:18 2008
@@ -120,6 +120,7 @@
<include name="${jackrabbit-commons.jar}"/>
<include name="${jackrabbit-rmi.jar}"/>
<include name="${jcr.jar}"/>
+ <include name="${jsr250.jar}"/>
<!-- Protocols should be coupled by deployment only -->
<include name='${path.lib.james}/apache-james-imap*.jar'/>
</fileset>
@@ -529,6 +530,7 @@
<lib dir='${lib.dir}/${path.lib.geronimo}'>
<include name='${jarname.j2ee-management-spec}'/>
<include name='${jarname.jms-spec}'/>
+ <include name='${jarname.geronimo.annotations}'/>
</lib>
<lib dir='${lib.dir}/${path.lib.activemq}'>
<include name='${jarname.activemq-web}'/>
Modified: james/server/trunk/spring-deployment/build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/build.xml?rev=725806&r1=725805&r2=725806&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/build.xml (original)
+++ james/server/trunk/spring-deployment/build.xml Thu Dec 11 12:40:18 2008
@@ -136,6 +136,7 @@
<include name="${jackrabbit-commons.jar}"/>
<include name="${jackrabbit-rmi.jar}"/>
<include name="${jcr.jar}"/>
+ <include name="${jsr250.jar}"/>
<!-- Protocols should be coupled by deployment only -->
<include name='${path.lib.james}/apache-james-imap*.jar'/>
</fileset>
Added:
james/server/trunk/stage/org.apache.geronimo.specs/jars/geronimo-annotation_1.0_spec-1.1.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.geronimo.specs/jars/geronimo-annotation_1.0_spec-1.1.jar?rev=725806&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
james/server/trunk/stage/org.apache.geronimo.specs/jars/geronimo-annotation_1.0_spec-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
james/server/trunk/stage/org.apache.james/jars/apache-jsieve-mailet-0.3-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-jsieve-mailet-0.3-SNAPSHOT.jar?rev=725806&r1=725805&r2=725806&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
