james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r537145 - in /james/server/trunk: ./ build-tools/ core-library/ fetchmail-function/ imapserver-function/ nntpserver-function/ phoenix-deployment/ pop3server-function/ remotemanager-function/ smtpserver-function/ spoolmanager-function/ stage...
Date Fri, 11 May 2007 09:42:33 GMT
Author: bago
Date: Fri May 11 02:42:31 2007
New Revision: 537145

URL: http://svn.apache.org/viewvc?view=rev&rev=537145
Log:
Fix ant and m2 builds for mailet changes / Updated staged dependencies.

Added:
    james/server/trunk/stage/org.apache.james/jars/mailet-3.0-SNAPSHOT.jar   (with props)
Removed:
    james/server/trunk/stage/org.apache.james/jars/mailet-2.3-SNAPSHOT.jar
Modified:
    james/server/trunk/build-tools/base-build.xml
    james/server/trunk/build.xml
    james/server/trunk/core-library/pom.xml
    james/server/trunk/fetchmail-function/pom.xml
    james/server/trunk/imapserver-function/pom.xml
    james/server/trunk/include.properties
    james/server/trunk/nntpserver-function/pom.xml
    james/server/trunk/phoenix-deployment/pom.xml
    james/server/trunk/pom.xml
    james/server/trunk/pop3server-function/pom.xml
    james/server/trunk/remotemanager-function/pom.xml
    james/server/trunk/smtpserver-function/pom.xml
    james/server/trunk/spoolmanager-function/pom.xml

Modified: james/server/trunk/build-tools/base-build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/build-tools/base-build.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/build-tools/base-build.xml (original)
+++ james/server/trunk/build-tools/base-build.xml Fri May 11 02:42:31 2007
@@ -182,7 +182,7 @@
                     <include name="${commons-lang.jar}"/>
                     <include name="${commons-configuration.jar}"/>
                     <include name="${jsieve.jar}"/>
-					<include name="${mailet.jar}"/>
+                    <include name="${mailet.jar}"/>
                     <include name="${commons-digester.jar}"/>           
                 </fileset>   
             </path>   
@@ -201,7 +201,6 @@
                 <!-- TODO Add content when APIs are broken out -->   
                 <fileset dir="${lib.dir}/${path.lib.james}">
                     <include name="${jars-prefix}*-api-${version}.jar" />
-                    <include name="${jars-prefix}mailet-library-${version}.jar" />
                 </fileset>
             </path>
             <path 

Modified: james/server/trunk/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/build.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/build.xml (original)
+++ james/server/trunk/build.xml Fri May 11 02:42:31 2007
@@ -59,9 +59,6 @@
         <attribute name='do'/>   
         <attribute name='dir' default='.'/>   
         <sequential>
-        	  <subant target='@{do}'>
-                <dirset dir='@{dir}' includes='mailet' />
-        	  </subant>
             <fordo do='@{do}' dir='@{dir}' type='library'/>
         </sequential>   
     </macrodef>    

Modified: james/server/trunk/core-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Fri May 11 02:42:31 2007
@@ -11,13 +11,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-api</artifactId>
-      <version>${parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-library</artifactId>
-      <version>${parent.version}</version>
+      <artifactId>mailet</artifactId>
+      <version>3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>

Modified: james/server/trunk/fetchmail-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/pom.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/fetchmail-function/pom.xml (original)
+++ james/server/trunk/fetchmail-function/pom.xml Fri May 11 02:42:31 2007
@@ -18,12 +18,7 @@
     -->
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-library</artifactId>
+      <artifactId>mailet</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: james/server/trunk/imapserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/pom.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/imapserver-function/pom.xml (original)
+++ james/server/trunk/imapserver-function/pom.xml Fri May 11 02:42:31 2007
@@ -18,12 +18,7 @@
     -->
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-library</artifactId>
+      <artifactId>mailet</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Fri May 11 02:42:31 2007
@@ -205,7 +205,7 @@
 commons-digester.jar=${path.lib.commonsdigester}/${jarname.commons-digester.jar}
 
 # ----- mailet-----
-jarname.mailet.jar=mailet-2.3-SNAPSHOT.jar
+jarname.mailet.jar=mailet-3.0-SNAPSHOT.jar
 mailet.jar=${path.lib.james}/${jarname.mailet.jar}
 
 

Modified: james/server/trunk/nntpserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/pom.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/nntpserver-function/pom.xml (original)
+++ james/server/trunk/nntpserver-function/pom.xml Fri May 11 02:42:31 2007
@@ -18,12 +18,7 @@
     -->
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-library</artifactId>
+      <artifactId>mailet</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: james/server/trunk/phoenix-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Fri May 11 02:42:31 2007
@@ -34,12 +34,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-library</artifactId>
+      <artifactId>mailet</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri May 11 02:42:31 2007
@@ -14,8 +14,6 @@
   <inceptionYear>2002</inceptionYear>
   <packaging>pom</packaging>
   <modules>
-    <module>mailet-api</module>
-    <module>mailet</module>
     <module>core-library</module>
     <module>smtpserver-function</module>
     <module>pop3server-function</module>
@@ -51,6 +49,15 @@
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
           </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>bin</descriptorRef>
+            <descriptorRef>src</descriptorRef>
+          </descriptorRefs>
         </configuration>
       </plugin>
     </plugins>

Modified: james/server/trunk/pop3server-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/pom.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/pop3server-function/pom.xml (original)
+++ james/server/trunk/pop3server-function/pom.xml Fri May 11 02:42:31 2007
@@ -18,12 +18,7 @@
     -->
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-library</artifactId>
+      <artifactId>mailet</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: james/server/trunk/remotemanager-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/pom.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/remotemanager-function/pom.xml (original)
+++ james/server/trunk/remotemanager-function/pom.xml Fri May 11 02:42:31 2007
@@ -11,12 +11,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-library</artifactId>
+      <artifactId>mailet</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: james/server/trunk/smtpserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/pom.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/smtpserver-function/pom.xml (original)
+++ james/server/trunk/smtpserver-function/pom.xml Fri May 11 02:42:31 2007
@@ -18,12 +18,7 @@
     -->
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-library</artifactId>
+      <artifactId>mailet</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: james/server/trunk/spoolmanager-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/pom.xml?view=diff&rev=537145&r1=537144&r2=537145
==============================================================================
--- james/server/trunk/spoolmanager-function/pom.xml (original)
+++ james/server/trunk/spoolmanager-function/pom.xml Fri May 11 02:42:31 2007
@@ -18,12 +18,7 @@
     -->
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailet-library</artifactId>
+      <artifactId>mailet</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>

Added: james/server/trunk/stage/org.apache.james/jars/mailet-3.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/mailet-3.0-SNAPSHOT.jar?view=auto&rev=537145
==============================================================================
Binary file - no diff available.

Propchange: james/server/trunk/stage/org.apache.james/jars/mailet-3.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message