james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bernd Fondermann <bf_...@brainlounge.de>
Subject Re: svn commit: r700912 - in /james/server/trunk: phoenix-deployment/build.xml spring-deployment/build.xml
Date Thu, 02 Oct 2008 18:01:06 GMT
thanks, Robert,

    Bernd (the oldest James newbie)

rdonkin@apache.org wrote:
> Author: rdonkin
> Date: Wed Oct  1 13:50:17 2008
> New Revision: 700912
> 
> URL: http://svn.apache.org/viewvc?rev=700912&view=rev
> Log:
> Added warning to compile when 'ant lite' is run on a clean checkout.
> 
> Modified:
>     james/server/trunk/phoenix-deployment/build.xml
>     james/server/trunk/spring-deployment/build.xml
> 
> Modified: james/server/trunk/phoenix-deployment/build.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?rev=700912&r1=700911&r2=700912&view=diff
> ==============================================================================
> --- james/server/trunk/phoenix-deployment/build.xml (original)
> +++ james/server/trunk/phoenix-deployment/build.xml Wed Oct  1 13:50:17 2008
> @@ -23,7 +23,7 @@
>    under the License.
>  -->
>  
> -<project default="main" basedir=".">
> +<project default="main" basedir="." name="pheonix-deployment-build">
>      <!--
>      Give user a chance to override without editing this file
>      (and without typing -D each time he compiles it)
> @@ -60,7 +60,16 @@
>      Set the classpath
>      ===================================================================
>      -->
> +    
> +    <fileset id='james.jars' dir='${lib.dir}'>
> +        <!-- TODO: include libraries without wildcards -->
> +        <include name="${path.lib.james}/${jars-prefix}*-api-${version}.jar"/>
> +        <include name="${path.lib.james}/${jars-prefix}*-util-${version}.jar"/>
> +        <include name="${path.lib.james}/${jars-prefix}*-library-${version}.jar"/>
> +        <include name="${path.lib.james}/${jars-prefix}*-function-${version}.jar"/>
> +    </fileset>   
>  
> +    &check-targets;   
>      <path id="project.class.path">
>          <fileset dir="${lib.dir}">
>              <include name='${jms-spec.jar}'/>
> @@ -108,14 +117,10 @@
>              <include name="${jackrabbit-commons.jar}"/>
>              <include name="${jackrabbit-rmi.jar}"/>
>              <include name="${jcr.jar}"/>
> -            <!-- TODO: include libraries without wildcards -->
> -            <include name="${path.lib.james}/${jars-prefix}*-api-${version}.jar"/>
> -            <include name="${path.lib.james}/${jars-prefix}*-util-${version}.jar"/>
> -            <include name="${path.lib.james}/${jars-prefix}*-library-${version}.jar"/>
> -            <include name="${path.lib.james}/${jars-prefix}*-function-${version}.jar"/>
>              <!-- Protocols should be coupled by deployment only -->
>              <include name='${path.lib.james}/apache-james-imap*.jar'/>
>          </fileset>
> +        <fileset refid="james.jars"/>   
>          <pathelement path="${java.class.path}" />
>          <pathelement path="${build.classes}" />
>      </path>
> @@ -139,8 +144,17 @@
>      ===================================================================
>      -->
>  
> -    &check-targets;
> -    <target name="check-dependencies" depends="javamail-check,activation-check"/>
> +    <target name='james-check'>
> +        <condition property="is.james.compiled">   
> +            <resourcecount refid="james.jars" when="greater" count="0" />   
> +        </condition>
> +        <fail unless="is.james.compiled">Please ensure that James server is compiled
> + before trying to build the spring deployment. Please note that 'dist' must be 
> + run at least once before 'lite' can be run.
> +        </fail>
> +    </target>   
> +    
> +    <target name="check-dependencies" depends="javamail-check,activation-check,james-check"/>
>  
>      <!--
>      ===================================================================
> 
> Modified: james/server/trunk/spring-deployment/build.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/build.xml?rev=700912&r1=700911&r2=700912&view=diff
> ==============================================================================
> --- james/server/trunk/spring-deployment/build.xml (original)
> +++ james/server/trunk/spring-deployment/build.xml Wed Oct  1 13:50:17 2008
> @@ -77,6 +77,14 @@
>          <!-- Paths to be included in compilation bootclasspath -->
>      </path>
>  
> +    <fileset id='james.jars' dir='${lib.dir}'>
> +        <!-- TODO: include libraries without wildcards -->
> +        <include name="${path.lib.james}/${jars-prefix}*-api-${version}.jar"/>
> +        <include name="${path.lib.james}/${jars-prefix}*-util-${version}.jar"/>
> +        <include name="${path.lib.james}/${jars-prefix}*-library-${version}.jar"/>
> +        <include name="${path.lib.james}/${jars-prefix}*-function-${version}.jar"/>
> +    </fileset>   
> +    
>      <!-- from phoenix-deployment build.xml -->
>      <path id="classpath.james.target">
>          <fileset dir="${lib.dir}">
> @@ -126,14 +134,10 @@
>              <include name="${jackrabbit-commons.jar}"/>
>              <include name="${jackrabbit-rmi.jar}"/>
>              <include name="${jcr.jar}"/>
> -            <!-- TODO: include libraries without wildcards -->
> -            <include name="${path.lib.james}/${jars-prefix}*-util-${version}.jar"/>
  
> -            <include name="${path.lib.james}/${jars-prefix}*-api-${version}.jar"/>
> -            <include name="${path.lib.james}/${jars-prefix}*-library-${version}.jar"/>
> -            <include name="${path.lib.james}/${jars-prefix}*-function-${version}.jar"/>
>              <!-- Protocols should be coupled by deployment only -->
> -            <include name='${path.lib.james}/apache-james-imap*.jar'/>   
> +            <include name='${path.lib.james}/apache-james-imap*.jar'/>
>          </fileset>
> +        <fileset refid="james.jars"/> 
>          <!--<pathelement path="${java.class.path}" />-->
>          <!--<pathelement path="${build.classes}" />-->
>      </path>
> @@ -238,6 +242,13 @@
>  
>      <target name="init" description="Build initialization">
>          <!-- Perform any build initialization in this target -->
> +            <condition property="is.james.compiled">   
> +                <resourcecount refid="james.jars" when="greater" count="0" />
  
> +            </condition>   
> +            <fail unless="is.james.compiled">Please ensure that James server is
compiled
> +     before trying to build the spring deployment. Please note that 'dist' must be 
> +     run at least once before 'lite' can be run.
> +            </fail>
>      </target>
>  
>      <target name="dist-lite" depends="everything" description="forwards to everything
- exists for compatibility with parent build.xml"/>
> @@ -410,39 +421,39 @@
>  		<GenerateEclipseProject 
>  			name='${name.module}' dir='${basedir}'>
>  			<dependencies>
> -        <classpathentry combineaccessrules="false" kind='src' path='/common-util'/>
> -        <classpathentry combineaccessrules="false" kind='src' path='/javamail-util'/>
> -        <classpathentry combineaccessrules="false" kind='src' path='/core-api'/>
> -        <classpathentry combineaccessrules="false" kind='src' path='/domain-api'/>
> -        <classpathentry combineaccessrules="false" kind='src' path='/imap-api'/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/user-api"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/core-library"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/management-library"/>
> -        <classpathentry combineaccessrules="false" kind='src' path='/avalon-socket-library'/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/imap-codec-library"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/imap-command-library"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/imapmailbox-library"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/mordred-library"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/user-library"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/avalon-user-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/basic-user-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/experimental-activemq-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/experimental-seda-imap-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/fetchmail-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/imap-mailbox-processor-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/imapserver-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/jcr-backend-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/nntpserver-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/phoenix-deployment"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/pop3server-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/remotemanager-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/core-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/smtpserver-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/spoolmanager-function"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/spring-deployment"/>
> -        <classpathentry combineaccessrules="false" kind="src" path="/torque-mailboxmanager-function"/>
> +        <classpathentry combineaccessrules="false" kind='src' path='/common-util'/>
> +        <classpathentry combineaccessrules="false" kind='src' path='/javamail-util'/>
> +        <classpathentry combineaccessrules="false" kind='src' path='/core-api'/>
> +        <classpathentry combineaccessrules="false" kind='src' path='/domain-api'/>
> +        <classpathentry combineaccessrules="false" kind='src' path='/imap-api'/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/user-api"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/core-library"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/management-library"/>
> +        <classpathentry combineaccessrules="false" kind='src' path='/avalon-socket-library'/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/imap-codec-library"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/imap-command-library"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/imapmailbox-library"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/mordred-library"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/user-library"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/avalon-user-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/basic-user-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/experimental-activemq-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/experimental-seda-imap-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/fetchmail-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/imap-mailbox-processor-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/imapserver-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/jcr-backend-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/nntpserver-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/phoenix-deployment"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/pop3server-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/remotemanager-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/core-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/smtpserver-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/spoolmanager-function"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/spring-deployment"/>
> +        <classpathentry combineaccessrules="false" kind="src" path="/torque-mailboxmanager-function"/>
>  			</dependencies>
>  		</GenerateEclipseProject>
>  	</target>
>  
> -</project>
> \ No newline at end of file
> +</project>
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
> For additional commands, e-mail: server-dev-help@james.apache.org
> 
> 


---------------------------------------------------------------------
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