Author: bago
Date: Thu Aug  3 15:59:18 2006
New Revision: 428558

URL: http://svn.apache.org/viewvc?rev=428558&view=rev
Log:
Fix release packages, introduce maven site generation for 2.3 (JAMES-582)

Added:
    james/server/branches/v2.3/pom.xml   (with props)
Modified:
    james/server/branches/v2.3/build.xml
    james/server/branches/v2.3/default.properties
    james/server/branches/v2.3/include.properties

Modified: james/server/branches/v2.3/build.xml
URL: 
http://svn.apache.org/viewvc/james/server/branches/v2.3/build.xml?rev=428558&r1=428557&r2=428558&view=diff
==============================================================================
--- james/server/branches/v2.3/build.xml (original)
+++ james/server/branches/v2.3/build.xml Thu Aug  3 15:59:18 2006
@@ -67,28 +67,31 @@
     -->
 
     <path id="project.class.path">
-      <pathelement location="${dns.jar}"/>
-      <pathelement location="${commons-collections.jar}"/>
-      <pathelement location="${commons-dbcp.jar}"/>
-      <pathelement location="${commons-pool.jar}"/>
-      <pathelement location="${jakarta-oro.jar}"/>
-      <pathelement location="${avalon-framework.jar}"/>
-      <pathelement location="${avalon-framework-impl.jar}"/>
-      <pathelement location="${excalibur-pool.jar}"/>
-      <pathelement location="${excalibur-pool-impl.jar}"/>
-      <pathelement location="${excalibur-thread.jar}"/>
-      <pathelement location="${excalibur-datasource.jar}"/>
-      <pathelement location="${cornerstone-threads.jar}"/>
-      <pathelement location="${cornerstone-connection.jar}"/>
-      <pathelement location="${cornerstone-connection-impl.jar}"/>
-      <pathelement location="${cornerstone-store.jar}"/>
-      <pathelement location="${cornerstone-scheduler.jar}"/>
-      <pathelement location="${cornerstone-sockets.jar}"/>
-      <pathelement location="${cornerstone-datasources.jar}"/>
-      <pathelement location="${javax-mail.jar}"/>
-      <pathelement location="${javax-activation.jar}"/>
-      <pathelement location="${lib.dir}/bcmail-jdk14-129.jar"/>
-      <pathelement location="${lib.dir}/bcmail-jdk14-129-workaround.jar"/>
+        <fileset dir="${lib.dir}">
+            <include name="${avalon-framework.jar}"/>
+            <include name="${avalon-framework-impl.jar}"/>
+            <include name="${dns.jar}"/>
+            <include name="${commons-collections.jar}"/>
+            <include name="${commons-dbcp.jar}"/>
+            <include name="${commons-pool.jar}"/>
+            <include name="${jakarta-oro.jar}"/>
+            <include name="${excalibur-pool-api.jar}"/>
+            <include name="${excalibur-pool-impl.jar}"/>
+            <include name="${excalibur-thread-api.jar}"/>
+            <include name="${excalibur-datasource.jar}"/>
+            <include name="${cornerstone-threads-api.jar}"/>
+            <include name="${cornerstone-connection-api.jar}"/>
+            <include name="${cornerstone-connection-impl.jar}"/>
+            <include name="${cornerstone-store-api.jar}"/>
+            <include name="${cornerstone-store-impl.jar}"/>
+            <include name="${cornerstone-scheduler-api.jar}"/>
+            <include name="${cornerstone-sockets-api.jar}"/>
+            <include name="${cornerstone-datasources-api.jar}"/>
+            <include name="${javax-mail.jar}"/>
+            <include name="${javax-activation.jar}"/>
+            <include name="${bcmail.jar}"/>
+            <include name="${bcmail-workaround.jar}"/>
+        </fileset>
       <pathelement path="${java.class.path}" />
       <pathelement path="${build.classes}" />
     </path>
@@ -97,7 +100,6 @@
         <fileset dir="${tools.lib.dir}">
             <include name="*.jar"/>
         </fileset>
-       <pathelement location="${phoenix-client.jar}"/>
     </path>
 
     <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
@@ -131,8 +133,7 @@
       <echo message="Preparing code"/>
 
       <tstamp/>
-      <available property="jdbc3.present" classname="java.sql.Savepoint"/>
-      <available file="${phoenix.dir}/bin" type="dir" 
property="phoenix.bin.present"/>
+        <available file="${james.dir}/${phoenix.dir}/bin" type="dir" 
property="phoenix.bin.present"/>
       <mkdir dir="${dist.dir}"/>
       <copy todir="${dist.dir}">
         <fileset dir=".">
@@ -144,7 +145,8 @@
       <fixcrlf srcdir="${java.dir}" includes="**/*.minfo" eol="lf" 
tab="remove" tablength="4" />
       <fixcrlf srcdir="${java.dir}" includes="**/*.xinfo" eol="lf" 
tab="remove" tablength="4" />
       <fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" 
tablength="4" />
-      <!-- fixcrlf srcdir="${xdocs.dir}" includes="**/*.xml" eol="lf" 
tab="remove" tablength="4" / -->
+        <fixcrlf srcdir="${junitjava.dir}" includes="**/*.java" eol="lf" 
tab="remove" tablength="4" />
+        <fixcrlf srcdir="${xdocs.dir}" includes="**/*.xml" eol="lf" 
tab="remove" tablength="4" />
       <fixcrlf srcdir="${conf.dir}" includes="**/*.xml" eol="lf" tab="remove" 
tablength="4" />
       <fixcrlf srcdir="${metainf.dir}" includes="**/*" eol="lf" tab="remove" 
tablength="4" />      
       <fixcrlf srcdir="." includes="build.sh" eol="lf"/>
@@ -155,12 +157,10 @@
           <include name="build.sh"/>
         </fileset>
       </chmod>
-      <available classname="org.apache.velocity.anakia.AnakiaTask" 
property="AnakiaTask.present"/>
       <mkdir dir="${build.src}"/>
       <copy todir="${build.src}">
         <fileset dir="${java.dir}">
           <include name="${constants.file}"/>
-          <include name="${poolconn.file}"/>
         </fileset>
       </copy>
       <replace file="${build.src}/${constants.file}" token="@@VERSION@@" 
value="${version}"/>
@@ -177,32 +177,33 @@
     <target name="prepare-phoenix" depends="prepare-common" 
if="phoenix.bin.present">
       <echo message="Phoenix distribution present - adjusting linefeeds and 
permissions, copying files"/>
       <property name="dist.bin" value="${dist.dir}/bin"/>
-      <fixcrlf srcdir="${phoenix.dir}/bin" includes="phoenix.sh" eol="lf"/>
+        <fixcrlf srcdir="${james.dir}/${phoenix.dir}/bin" 
includes="phoenix.sh" eol="lf"/>
+        
       <copy todir="${dist.dir}">
         <fileset dir="${phoenix.dir}">
-          <exclude name="CVS/**"/>
         </fileset>
       </copy>
 
       <copy todir="${dist.dir}/lib" flatten="true">
         <fileset dir="${lib.dir}">
-          <exclude name="CVS/**"/>
-          <include name="excalibur-thread-api-2.1.jar"/>
-          <include name="excalibur-thread-impl-2.1.jar"/>
-          <include name="**/excalibur-pool-impl-2.1.jar"/>
-          <include name="**/excalibur-pool-api-2.1.jar"/>
-          <include name="**/commons-collections-2.1.1.jar"/>
+                <include name="${excalibur-thread-api.jar}"/>
+                <include name="${excalibur-thread-impl.jar}"/>
+                <include name="${excalibur-pool-impl.jar}"/>
+                <include name="${excalibur-pool-api.jar}"/>
+                <include name="${commons-collections.jar}"/>
           <!-- needed by excalibur-pool-impl-2.1.jar -->
-          <include name="concurrent-1.3.4.jar"/>
+                <include name="${concurrent.jar}"/>
         </fileset>
       </copy>
 
+        <fixcrlf srcdir="${james.dir}/${phoenix.dir}/bin" 
includes="james-server.sh" eol="lf"/>
       <fixcrlf srcdir="${dist.bin}" includes="run.sh" eol="lf"/>
       <fixcrlf srcdir="${dist.bin}" includes="run.bat" eol="crlf"/>
       <chmod perm="+x">
         <fileset dir="${dist.bin}">
           <include name="run.sh"/>
           <include name="phoenix.sh"/>
+                <include name="james-server.sh"/>
         </fileset>
       </chmod>
        
@@ -265,21 +266,10 @@
 
     <!--
     ===================================================================
-                                   jdbc3
-    ===================================================================
-    -->
-    <target name="prepare-jdbc3" depends="prepare-common" 
unless="jdbc3.present">
-        <echo message="JDBC v3 not in classpath - making code compliant with 
older JDBC"/>
-        <replace file="${build.src}/${poolconn.file}" token="/*-- 
JDBC_3_ANT_KEY */" value="/* JDBC_3_ANT_KEY"/>
-        <replace file="${build.src}/${poolconn.file}" token="/* JDBC_3_ANT_KEY 
--*/" value="JDBC_3_ANT_KEY */"/>
-    </target>
-
-    <!--
-    ===================================================================
                                   Prepare target
     ===================================================================
     -->
-    <target name="prepare" 
depends="prepare-common,prepare-phoenix,prepare-jdbc3,prepare-mxinfo,prepare-metainf"/>
+    <target name="prepare" 
depends="prepare-common,prepare-phoenix,prepare-mxinfo,prepare-metainf"/>
 
     <!--
     ===================================================================
@@ -290,15 +280,12 @@
 
     <target name="compile-main" depends="prepare">
       <echo message="Compiling James Java sources"/>
-      <available property="jndi.present" 
classname="javax.naming.InitialContext"/>
       <mkdir dir="${build.classes}"/>
       <javac destdir="${build.classes}" debug="${debug}" 
optimize="${optimize}" deprecation="${deprecation}" target="${jdk.target}" 
source="${jdk.source}">
         <classpath refid="project.class.path"/>
         <src path="${build.src}"/>
         <src path="${java.dir}"/>
         <exclude name="${constants.file}"/>
-        <exclude name="${poolconn.file}"/>
-        <exclude 
name="org/apache/james/userrepository/UsersLDAPRepository.java" 
unless="jndi.present"/>
       </javac>
       <copy todir="${build.classes}">
         <fileset dir="${java.dir}">
@@ -422,7 +409,6 @@
       <echo message="preparing website in ${www.dir}"/>
       <delete>
         <fileset dir="${www.dir}">
-          <exclude name="CVS/**"/>
           <exclude name="rfclist/**"/>
           <exclude name="javadocs/**"/>
           <exclude name="mailet/**"/>
@@ -507,36 +493,35 @@
           <include name="james-${version}.jar"/>         
         </lib>
         <lib dir="${lib.dir}">
-          <include name="${avalon-framework.jar}"/>
-          <include name="${avalon-framework-impl.jar}"/>
-          <include name="dnsjava-2.0.1.jar"/>
-          <include name="jakarta-oro-2.0.8.jar"/>
-          <include name="derby.jar"/>
-          <include name="excalibur-datasource-2.1.jar"/>
-          <include name="activation-1.1.jar"/>
-          <include name="mail-1.4.0.jar"/>
-          <include name="commons-dbcp-1.2.1.jar"/>
-          <include name="commons-pool-1.2.jar"/>
-          <include name="bcmail-jdk14-129.jar"/>
-          <include name="bcmail-jdk14-129-workaround.jar"/>
-          <include name="excalibur-thread-api-2.1.jar"/>
-          <include name="excalibur-thread-impl-2.1.jar"/>
-          <include name="excalibur-pool-api-2.1.jar"/>
-          <include name="excalibur-pool-impl-2.1.jar"/>
-          <include name="commons-collections-2.1.1.jar"/>
-          <include name="cornerstone-threads-api-2.1.jar"/>
-          <include name="cornerstone-threads-impl-2.1.jar"/>
-          <include name="cornerstone-connection-api-2.1.jar"/>
-          <include name="cornerstone-connection-impl-2.1.jar"/>
-          <include name="cornerstone-store-api-2.1.jar"/>
-          <include name="cornerstone-store-impl-2.1.jar"/>
-          <include name="cornerstone-scheduler-api-2.1.jar"/>
-          <include name="cornerstone-scheduler-impl-2.1.jar"/>
-          <include name="cornerstone-sockets-api-2.1.jar"/>
-          <include name="cornerstone-sockets-impl-2.1-patched.jar"/>
-          <include name="cornerstone-datasources-api-2.1.jar"/>
-          <include name="cornerstone-datasources-impl-2.1-patched.jar"/>
-          <include name="concurrent-1.3.4.jar"/>
+                <include name="${dns.jar}"/>
+                <include name="${jakarta-oro.jar}"/>
+                <include name="${derby.jar}"/>
+                <include name="${excalibur-datasource.jar}"/>
+                <include name="${javax-activation.jar}"/>
+                <include name="${javax-mail.jar}"/>
+                <include name="${commons-dbcp.jar}"/>
+                <include name="${commons-pool.jar}"/>
+                <include name="${bcmail.jar}"/>
+                <include name="${bcmail-workaround.jar}"/>
+                <include name="${excalibur-thread-api.jar}"/>
+                <include name="${excalibur-thread-impl.jar}"/>
+                <include name="${excalibur-pool-api.jar}"/>
+                <include name="${excalibur-pool-impl.jar}"/>
+                <include name="${commons-collections.jar}"/>
+                <include name="${cornerstone-threads-api.jar}"/>
+                <include name="${cornerstone-threads-impl.jar}"/>
+                <include name="${cornerstone-connection-api.jar}"/>
+                <include name="${cornerstone-connection-impl.jar}"/>
+                <include name="${cornerstone-store-api.jar}"/>
+                <include name="${cornerstone-store-impl.jar}"/>
+                <include name="${cornerstone-scheduler-api.jar}"/>
+                <include name="${cornerstone-scheduler-impl.jar}"/>
+                <include name="${cornerstone-sockets-api.jar}"/>
+                <include name="${cornerstone-sockets-impl.jar}"/>
+                <include name="${cornerstone-datasources-api.jar}"/>
+                <include name="${cornerstone-datasources-impl.jar}"/>
+                <include name="${concurrent.jar}"/>
+
         </lib>
         <zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
           <include name="sqlResources.xml"/>
@@ -639,12 +624,7 @@
         <echo message ="Building source distributions with Phoenix binaries"/>
         <zip 
zipfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.zip">
             <fileset dir=".">
-                <include name="${dist.dir}/**"/>
-                <exclude name="${dist.dir}/downloads/**"/>
-                <exclude name="${dist.dir}/apps/*.sar"/>
-                <exclude name=""/>
                 <include name="*.txt"/>
-                <include name="*.xml"/>
                 <include name="KEYS"/>
                 <include name="README"/>
                 <include name="LICENSE.txt"/>
@@ -652,19 +632,15 @@
                 <include name="build.*"/>
                 <include name="lib/**"/>
                 <include name="${phoenix.dir}/**"/>
-                <include name="proposals/**"/>
                 <include name="src/**"/>
                 <include name="tools/**"/>
-                <include name="www/**"/>
+                <include name="*.properties" />
+                <include name="*.ent" />
             </fileset>
         </zip>
         <tar longfile="gnu" 
tarfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar">
             <tarfileset dir="." username="${name}" group="${name}">
-                <include name="${dist.dir}/**"/>
-                <exclude name="${dist.dir}/downloads/**"/>
-                <exclude name="${dist.dir}/apps/*.sar"/>
                 <include name="*.txt"/>
-                <include name="*.xml"/>
                 <include name="KEYS"/>
                 <include name="README"/>
                 <include name="LICENSE.txt"/>
@@ -672,10 +648,10 @@
                 <include name="build.*"/>
                 <include name="lib/**"/>
                 <include name="${phoenix.dir}/**"/>
-                <include name="proposals/**"/>
                 <include name="src/**"/>
                 <include name="tools/**"/>
-                <include name="www/**"/>
+                <include name="*.properties" />
+                <include name="*.ent" />
             </tarfileset>
         </tar>
         <gzip 
zipfile="${dist.source.dir}/${name}-with-phoenix-${version}-src.tar.gz"
@@ -692,34 +668,30 @@
             <fileset dir=".">
                 <include name="src/**"/>
                 <include name="lib/**"/>
-                <include name="${phoenix.lib.dir}/**"/>
-                <include name="proposals/**"/>
-                <include name="www/**"/>
                 <include name="tools/**"/>
-                <include name="*.xml"/>
                 <include name="*.txt"/>
                 <include name="README"/>
                 <include name="KEYS"/>
                 <include name="LICENSE.txt"/>
                 <include name="NOTICE.txt"/>
                 <include name="build.*"/>
+                <include name="*.properties" />
+                <include name="*.ent" />
             </fileset>
         </zip>
         <tar longfile="gnu" tarfile="${dist.source.dir}/${dist.name}-src.tar">
             <tarfileset dir="." username="${name}" group="${name}">
                 <include name="src/**"/>
                 <include name="lib/**"/>
-                <include name="${phoenix.lib.dir}/**"/>
-                <include name="proposals/**"/>
-                <include name="www/**"/>
                 <include name="tools/**"/>
-                <include name="*.xml"/>
                 <include name="*.txt"/>
                 <include name="README"/>
                 <include name="KEYS"/>
                 <include name="LICENSE.txt"/>
                 <include name="NOTICE.txt"/>
                 <include name="build.*"/>
+                <include name="*.properties" />
+                <include name="*.ent" />
             </tarfileset>
         </tar>
         <gzip zipfile="${dist.source.dir}/${dist.name}-src.tar.gz" 
src="${dist.source.dir}/${dist.name}-src.tar"/>
@@ -783,11 +755,10 @@
                                   unit tests
     ===================================================================
     -->
-    <target name="unit-tests-classpath" depends="prepare">
+    <target name="unit-tests-classpath" depends="compile">
         <path id="unittest.class.path">
           <pathelement location="tools/lib/optional.jar"/>
           <pathelement location="tools/lib/junit.jar"/>
-          <pathelement location="tools/lib/ristretto-1.0-all.jar"/>
           <pathelement location="tools/lib/commons-net-1.4.1.jar"/>
           <fileset dir="${lib.dir}">
             <include name="*.jar"/>
@@ -804,14 +775,13 @@
         <classpath refid="project.class.path"/>
         <src path="${junitjava.dir}"/>
         <exclude name="${constants.file}"/>
-        <exclude name="${poolconn.file}"/>
       </javac>
        <copy todir="${build.test.classes}">
                <fileset dir="${junitjava.dir}" includes="**/*.zone" />
        </copy>
     </target>
 
-    <target name="run-unit-tests" depends="unit-tests-classpath, 
compile-unit-tests">
+    <target name="run-unit-tests" depends="compile-unit-tests">
         <echo message="Running James Unit Tests"/>
         <mkdir dir="${build.test}"/>
         <mkdir dir="${build.test.reports}"/>

Modified: james/server/branches/v2.3/default.properties
URL: 
http://svn.apache.org/viewvc/james/server/branches/v2.3/default.properties?rev=428558&r1=428557&r2=428558&view=diff
==============================================================================
--- james/server/branches/v2.3/default.properties (original)
+++ james/server/branches/v2.3/default.properties Thu Aug  3 15:59:18 2006
@@ -69,10 +69,9 @@
 java.dir=${src.dir}/java
 junitjava.dir=${src.dir}/test
 conf.dir=${src.dir}/conf
-xdocs.dir=${src.dir}/xdocs
+xdocs.dir=${src.dir}/site/xdoc
 docs.src=${xdocs.dir}
 constants.file = org/apache/james/Constants.java
-poolconn.file = org/apache/james/util/mordred/PoolConnEntry.java
 metainf.dir = ${src.dir}/meta-inf
 
 #

Modified: james/server/branches/v2.3/include.properties
URL: 
http://svn.apache.org/viewvc/james/server/branches/v2.3/include.properties?rev=428558&r1=428557&r2=428558&view=diff
==============================================================================
--- james/server/branches/v2.3/include.properties (original)
+++ james/server/branches/v2.3/include.properties Thu Aug  3 15:59:18 2006
@@ -15,67 +15,75 @@
 #
 
 lib.dir = ${james.dir}/lib
-phoenix.dir = ${james.dir}/phoenix-bin
-phoenix.lib.dir = ${phoenix.dir}/lib
-candidates.dir = ${lib.dir}
+phoenix.dir = phoenix-bin
 
 # --------------------------------------------------
 #                REQUIRED LIBRARIES
 # --------------------------------------------------
 
 # ----- Avalon Framework -----
-avalon-framework.jar=${phoenix.lib.dir}/avalon-framework-api-4.3.jar
+avalon-framework.jar=avalon-framework-api-4.3.jar
 
 # ----- Avalon Framework -----
-avalon-framework-impl.jar=${phoenix.lib.dir}/avalon-framework-impl-4.3.jar
-
-# ----- Phoenix Client -----
-phoenix-client.jar=${phoenix.lib.dir}/phoenix-client.jar
+avalon-framework-impl.jar=avalon-framework-impl-4.3.jar
 
 # ----- From lib
 
 # ----- Excalibur datasource -----
-excalibur-datasource.jar=${lib.dir}/excalibur-datasource-2.1.jar
+excalibur-datasource.jar=excalibur-datasource-2.1.jar
 
 # ----- Javax mail -----
-javax-mail.jar=${lib.dir}/${javamail.id}.jar
+javax-mail.jar=${javamail.id}.jar
 
 # ----- Activation -----
-javax-activation.jar=${lib.dir}/${activation.id}.jar
+javax-activation.jar=${activation.id}.jar
 
 # ----- DNS -----
-dns.jar=${lib.dir}/dnsjava-2.0.1.jar
+dns.jar=dnsjava-2.0.1.jar
 
 # ----- Commons -----
-commons-dbcp.jar=${lib.dir}/commons-dbcp-1.2.1.jar
-commons-pool.jar=${lib.dir}/commons-pool-1.2.jar
-commons-collections.jar=${candidates.dir}/commons-collections-2.1.1.jar
+commons-dbcp.jar=commons-dbcp-1.2.1.jar
+commons-pool.jar=commons-pool-1.2.jar
+commons-collections.jar=commons-collections-2.1.1.jar
 
 # ----- Jakarta ORO -----
-jakarta-oro.jar=${lib.dir}/jakarta-oro-2.0.8.jar
+jakarta-oro.jar=jakarta-oro-2.0.8.jar
 
 # ----- Cornerstone threads, version 1.0 or later -----
-cornerstone-threads.jar=${candidates.dir}/cornerstone-threads-api-2.1.jar
+cornerstone-threads-api.jar=cornerstone-threads-api-2.1.jar
+cornerstone-threads-impl.jar=cornerstone-threads-impl-2.1.jar
 
 # ----- Cornerstone connection, version 1.0 or later -----
-cornerstone-connection.jar=${candidates.dir}/cornerstone-connection-api-2.1.jar
-cornerstone-connection-impl.jar=${candidates.dir}/cornerstone-connection-impl-2.1.jar
+cornerstone-connection-api.jar=cornerstone-connection-api-2.1.jar
+cornerstone-connection-impl.jar=cornerstone-connection-impl-2.1.jar
 
 # ----- Cornerstone masterstore, version 1.0 or later -----
-cornerstone-store.jar=${candidates.dir}/cornerstone-store-api-2.1.jar
+cornerstone-store-api.jar=cornerstone-store-api-2.1.jar
+cornerstone-store-impl.jar=cornerstone-store-impl-2.1.jar
 
 # ----- Cornerstone sockets, version 1.0 or later -----
-cornerstone-sockets.jar=${candidates.dir}/cornerstone-sockets-api-2.1.jar
+cornerstone-sockets-api.jar=cornerstone-sockets-api-2.1.jar
+cornerstone-sockets-impl.jar=cornerstone-sockets-impl-2.1-patched.jar
 
 # ----- Cornerstone scheduler, version 1.0 or later -----
-cornerstone-scheduler.jar=${candidates.dir}/cornerstone-scheduler-api-2.1.jar
+cornerstone-scheduler-api.jar=cornerstone-scheduler-api-2.1.jar
+cornerstone-scheduler-impl.jar=cornerstone-scheduler-impl-2.1.jar
 
 # ----- Cornerstone scheduler, version 1.0 or later -----
-cornerstone-datasources.jar=${candidates.dir}/cornerstone-datasources-api-2.1.jar
+cornerstone-datasources-api.jar=cornerstone-datasources-api-2.1.jar
+cornerstone-datasources-impl.jar=cornerstone-datasources-impl-2.1-patched.jar
 
 # ----- Excalibur thread, version 1.0 or later -----
-excalibur-thread.jar=${candidates.dir}/excalibur-thread-api-2.1.jar
+excalibur-thread-api.jar=excalibur-thread-api-2.1.jar
+excalibur-thread-impl.jar=excalibur-thread-impl-2.1.jar
 
 # ----- Excalibur pool -----
-excalibur-pool.jar=${candidates.dir}/excalibur-pool-api-2.1.jar
-excalibur-pool-impl.jar=${candidates.dir}/excalibur-pool-impl-2.1.jar
+excalibur-pool-api.jar=excalibur-pool-api-2.1.jar
+excalibur-pool-impl.jar=excalibur-pool-impl-2.1.jar
+
+concurrent.jar=concurrent-1.3.4.jar
+
+derby.jar=derby.jar
+
+bcmail.jar=bcmail-jdk14-129.jar
+bcmail-workaround.jar=bcmail-jdk14-129-workaround.jar

Added: james/server/branches/v2.3/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/branches/v2.3/pom.xml?rev=428558&view=auto
==============================================================================
--- james/server/branches/v2.3/pom.xml (added)
+++ james/server/branches/v2.3/pom.xml Thu Aug  3 15:59:18 2006
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  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.    
+-->
+<!--
+ | DISCLAIMER DISCLAIMER DISCLAIMER DISCLAIMER DISCLAIMER 
+ | 
+ | This file is only intended to be used to build the james-server
+ | website. It must not be used to build packages for james-server
+ | application.
+ | 
+ | DISCLAIMER DISCLAIMER DISCLAIMER DISCLAIMER DISCLAIMER 
+ -->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>james-server</artifactId>
+  <name>Apache JAMES Server Project</name>
+  <version>2.3.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <description>
+    The Apache Java Enterprise Mail Server (a.k.a. JAMES Server)
+  </description>
+  <parent>
+    <groupId>org.apache.james</groupId>
+    <artifactId>james-project</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <url>http://james.apache.org/server/index.html</url>
+  <inceptionYear>2002</inceptionYear>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>http://issues.apache.org/jira/browse/JAMES</url>
+  </issueManagement>
+
+  <ciManagement>
+    <system>continuum</system>
+    <notifiers>
+      <notifier>
+        <type>mail</type>
+        <sendOnError />
+        <sendOnFailure />
+        <address>[email protected]</address>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+
+  <mailingLists>
+    <mailingList>
+      <name>Server User List</name>
+      <subscribe>[EMAIL PROTECTED]</subscribe>
+      <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+      
<archive>http://www.mail-archive.com/[email protected]/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Server Developer List</name>
+      <subscribe>[EMAIL PROTECTED]</subscribe>
+      <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+      <post>[email protected]</post>
+      
<archive>http://www.mail-archive.com/[email protected]/</archive>
+    </mailingList>
+    <mailingList>
+      <name>James General List</name>
+      <subscribe>[EMAIL PROTECTED]</subscribe>
+      <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+      <archive>http://www.mail-archive.com/[EMAIL PROTECTED]/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/james/server/branches/v2.3
+    </connection>
+    <developerConnection>
+      scm:svn:https://[EMAIL PROTECTED]/repos/asf/james/server/branches/v2.3
+    </developerConnection>
+    <url>
+      
http://svn.apache.org/viewcvs.cgi/james/server/branches/v2.3?root=Apache-SVN
+    </url>
+  </scm>
+
+  <repositories>
+    <repository>
+      <id>bago-dist-m1</id>
+      <name>Temporary Repository</name>
+      <url>http://people.apache.org/~bago/maven/dist-m1</url>
+      <layout>legacy</layout>
+      <snapshots>
+        <enabled>true</enabled>
+        <checksumPolicy>ignore</checksumPolicy>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <dependencies verbose="true">
+
+    <!-- NEED TO DEAL WITH THESE JARS -->
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcmail-jdk14</artifactId>
+      <version>129</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcmail-jdk14-workaround</artifactId>
+      <version>129</version>
+    </dependency>
+    <!-- NEED TO DEAL WITH THESE JARS -->
+    
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+    </dependency>
+
+    <dependency>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+      <version>4.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+      <version>4.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jmock</groupId>
+          <artifactId>jmock</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xalan</groupId>
+          <artifactId>xalan</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xmlParserAPIs</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>1.4.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>cornerstone-connection</groupId>
+      <artifactId>cornerstone-connection-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>cornerstone-connection</groupId>
+      <artifactId>cornerstone-connection-impl</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>cornerstone-sockets</groupId>
+      <artifactId>cornerstone-sockets-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>cornerstone-sockets</groupId>
+      <artifactId>cornerstone-sockets-impl</artifactId>
+      <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>cornerstone-datasources</groupId>
+      <artifactId>cornerstone-datasources-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>excalibur-datasource</groupId>
+      <artifactId>excalibur-datasource</artifactId>
+      <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>excalibur-pool</groupId>
+          <artifactId>excalibur-pool-instrumented</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>excalibur-component</groupId>
+          <artifactId>excalibur-component</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>excalibur-component</groupId>
+          <artifactId>excalibur-testcase</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>excalibur-fortress</groupId>
+          <artifactId>excalibur-fortress</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>excalibur-fortress</groupId>
+          <artifactId>excalibur-fortress-container-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>excalibur-logger</groupId>
+          <artifactId>excalibur-logger</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>hsqldb</groupId>
+          <artifactId>hsqldb</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>excalibur-fortress</groupId>
+          <artifactId>excalibur-fortress-meta</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>cornerstone-datasources</groupId>
+      <artifactId>cornerstone-datasources-impl</artifactId>
+      <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>d-haven-managed-pool</groupId>
+          <artifactId>d-haven-managed-pool</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>cornerstone-scheduler</groupId>
+      <artifactId>cornerstone-scheduler-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>cornerstone-scheduler</groupId>
+      <artifactId>cornerstone-scheduler-impl</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>cornerstone-store</groupId>
+      <artifactId>cornerstone-store-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>cornerstone-store</groupId>
+      <artifactId>cornerstone-store-impl</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>dnsjava</groupId>
+      <artifactId>dnsjava</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>excalibur-thread</groupId>
+      <artifactId>excalibur-thread-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>excalibur-thread</groupId>
+      <artifactId>excalibur-thread-impl</artifactId>
+      <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>junitperf</groupId>
+          <artifactId>junitperf</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>avalon-logkit</groupId>
+      <artifactId>avalon-logkit</artifactId>
+      <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>geronimo-spec</groupId>
+          <artifactId>geronimo-spec-javamail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>geronimo-spec</groupId>
+          <artifactId>geronimo-spec-jms</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>servletapi</groupId>
+          <artifactId>servletapi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.8</version>
+    </dependency>
+
+  </dependencies>
+
+  <distributionManagement>
+    <repository>
+      <id>james-repo</id>
+      <name>James Central Repository</name>
+      <url>scp://minotaur.apache.org/www/james.apache.org/dist-m2</url>
+    </repository>
+    <snapshotRepository>
+      <id>james-snapshots</id>
+      <name>James Central Development Repository</name>
+      
<url>scp://minotaur.apache.org/www/james.apache.org/dist-m2-snapshot</url>
+    </snapshotRepository>
+    <site>
+      <id>james-website</id>
+      
<url>scp://minotaur.apache.org/www/james.apache.org/public_html/maven/</url>
+    </site>
+  </distributionManagement>
+
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
+
+    <testResources>
+      <testResource>
+        <directory>src/test</directory>
+        <includes>
+          <include>**/*.zone</include>
+        </includes>
+      </testResource>
+    </testResources>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+      <!-- Removed because it seems to have bugs.
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>surefire-report-maven-plugin</artifactId>
+      </plugin>
+      -->
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jxr-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <configuration>
+          <targetjdk>1.4</targetjdk>
+          <rulesets>
+            <ruleset>/rulesets/basic.xml</ruleset>
+            <ruleset>/rulesets/controversial.xml</ruleset>
+          </rulesets>
+          <format>xml</format>
+          <linkXref>true</linkXref>
+          <sourceEncoding>utf-8</sourceEncoding>
+          <minimumTokens>100</minimumTokens>
+        </configuration>
+      </plugin>
+      <!--
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+      </plugin>
+      -->
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+
+</project>
\ No newline at end of file

Propchange: james/server/branches/v2.3/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to