You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by mc...@apache.org on 2004/09/10 06:00:52 UTC
cvs commit: james-server/project README.TXT build.xml standard.xml verify.xml
mcconnell 2004/09/09 21:00:52
Modified: project README.TXT build.xml standard.xml verify.xml
Log:
Update the build porocedure to correct a bug in the handling of the setup porocedure.
Revision Changes Path
1.3 +5 -0 james-server/project/README.TXT
Index: README.TXT
===================================================================
RCS file: /home/cvs/james-server/project/README.TXT,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.TXT 28 Aug 2004 05:06:23 -0000 1.2
+++ README.TXT 10 Sep 2004 04:00:51 -0000 1.3
@@ -43,3 +43,8 @@
install the dependent ant libraries and build
artifacts
+ /james-server/project/merlin ............. resources specific to James in Merlin
+
+
+
+
1.2 +17 -57 james-server/project/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/james-server/project/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 28 Aug 2004 05:04:05 -0000 1.1
+++ build.xml 10 Sep 2004 04:00:51 -0000 1.2
@@ -3,30 +3,16 @@
<project name="james-server" default="install" basedir="../."
xmlns:x="antlib:org.apache.avalon.tools">
- <!--
+ <!--
==============================================================================
Declare james specific properties used within the build.
==============================================================================
- -->
+ -->
<property name="Name" value="James Mail Server"/>
<property name="constants.filename" value="org/apache/james/Constants.java"/>
<property name="poolconn.filename" value="org/apache/james/util/mordred/PoolConnEntry.java"/>
<available property="jdbc3.present" classname="java.sql.Savepoint"/>
- <property name="project.src.main" value="java"/>
-
- <!--
- ==============================================================================
- Verify the the necessary ant libraries are installed.
- ==============================================================================
- -->
- <import file="verify.xml"/>
-
- <!--
- ==============================================================================
- Read centralized artifact group, name and version references.
- ==============================================================================
- -->
- <x:home index="project/index.xml"/>
+ <property name="project.src.main" value="java"/>
<!--
==============================================================================
@@ -40,6 +26,7 @@
Add james specific build enhancements.
==============================================================================
-->
+
<target name="prepare" depends="verify,standard.prepare,jdbc3">
<replace file="target/build/main/${constants.filename}"
token="@@VERSION@@" value="${project.version}"/>
@@ -60,57 +47,31 @@
<x:include name="datasources"
artifact="block:avalon/cornerstone/cornerstone-datasources-impl#SNAPSHOT"/>
<x:include name="store"
- artifact="block:avalon/cornerstone/cornerstone-store-impl#SNAPSHOT">
- <!-- configuration override required -->
- </x:include>
+ artifact="block:avalon/cornerstone/cornerstone-store-impl#SNAPSHOT"/>
<x:component name="connections"
- class="org.apache.james.util.connection.SimpleConnectionManager">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.util.connection.SimpleConnectionManager"/>
<x:component name="server"
- class="org.apache.james.James">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.James"/>
<x:component name="dns"
- class="org.apache.james.dnsserver.DNSServer">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.dnsserver.DNSServer"/>
<x:component name="remote"
- class="org.apache.james.remotemanager.RemoteManager">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.remotemanager.RemoteManager"/>
<x:component name="pop3"
- class="org.apache.james.pop3server.POP3Server">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.pop3server.POP3Server"/>
<x:component name="smtp"
- class="org.apache.james.smtpserver.SMTPServer">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.smtpserver.SMTPServer"/>
<x:component name="mailstore"
- class="org.apache.james.core.AvalonMailStore">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.core.AvalonMailStore"/>
<x:component name="userstore"
- class="org.apache.james.core.AvalonUsersStore">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.core.AvalonUsersStore"/>
<x:component name="spool"
- class="org.apache.james.transport.JamesSpoolManager">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.transport.JamesSpoolManager"/>
<x:component name="nntp-repository"
- class="org.apache.james.nntpserver.repository.NNTPRepositoryImpl" activation="false">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.nntpserver.repository.NNTPRepositoryImpl" activation="false"/>
<x:component name="nntp"
- class="org.apache.james.nntpserver.NNTPServer" activation="false">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.nntpserver.NNTPServer" activation="false"/>
<x:component name="fetchpop"
- class="org.apache.james.fetchpop.FetchScheduler" activation="false">
- <!-- configuration override required -->
- </x:component>
+ class="org.apache.james.fetchpop.FetchScheduler" activation="false"/>
</x:block>
</target>
@@ -143,6 +104,5 @@
<x:nag to="server-dev@james.apache.org"/>
</x:gump>
</target>
-
</project>
1.2 +8 -1 james-server/project/standard.xml
Index: standard.xml
===================================================================
RCS file: /home/cvs/james-server/project/standard.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- standard.xml 28 Aug 2004 05:04:05 -0000 1.1
+++ standard.xml 10 Sep 2004 04:00:51 -0000 1.2
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<project name="standard" xmlns:x="antlib:org.apache.avalon.tools">
- <x:home/>
+ <!--
+ ==============================================================================
+ Declare james specific properties used within the build.
+ ==============================================================================
+ -->
+ <import file="verify.xml"/>
+
+ <x:home index="project/index.xml"/>
<target name="info">
<x:info/>
1.2 +2 -0 james-server/project/verify.xml
Index: verify.xml
===================================================================
RCS file: /home/cvs/james-server/project/verify.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- verify.xml 28 Aug 2004 05:04:05 -0000 1.1
+++ verify.xml 10 Sep 2004 04:00:51 -0000 1.2
@@ -47,6 +47,8 @@
<property name="magic.cache" value="${magic.home}/main"/>
<unbar repository="${magic.cache}"
href="http://www.dpml.net/james/bars/james-supplemental-1.0.bar"/>
+ <unbar repository="${magic.cache}"
+ href="http://www.dpml.net/avalonx/supplemental/bars/avalonx-supplemental-1.0.bar"/>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org