portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raph...@apache.org
Subject cvs commit: jakarta-jetspeed/scratchpad/jetspeed-cms/lib jdbc-se2.0.jar jdbc2_0-stdext.jar jta.jar
Date Sun, 02 Mar 2003 14:58:19 GMT
raphael     2003/03/02 06:58:19

  Modified:    scratchpad/jetspeed-cms build.xml
  Removed:     scratchpad/jetspeed-cms/lib jdbc-se2.0.jar
                        jdbc2_0-stdext.jar jta.jar
  Log:
  Remove SUN BCL libraries.
  Update the build file to query for JTA separate download
  
  Revision  Changes    Path
  1.2       +35 -10    jakarta-jetspeed/scratchpad/jetspeed-cms/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/scratchpad/jetspeed-cms/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	29 Oct 2002 16:05:25 -0000	1.1
  +++ build.xml	2 Mar 2003 14:58:18 -0000	1.2
  @@ -18,7 +18,7 @@
   
       <property name="project.fullname" value="Jetspeed CMS Service"/>
       <property name="project.name" value="jetspeed-cms"/>
  -    <property name="project.version" value="0.1"/>      
  +    <property name="project.version" value="0.2"/>      
   
       <!-- =================================================================== -->
       <!-- Set the properties related to the source tree                       -->
  @@ -47,11 +47,11 @@
       <property name="build.dest.dir" value="${build.dir}/classes"/>        
       <property name="javadocs.destdir" value="docs/api"/>    
       <property name="release.dir" value="${project.name}-${project.version}/"/>
  -	  <property name="install.war" value="${build.dir}/webapp"/>
  +          <property name="install.war" value="${build.dir}/webapp"/>
   
       <!-- Miscellaneous settings -->
   
  -    <property name="year" value="2002"/>
  +    <property name="year" value="2003"/>
       <property name="locale.default" value="en"/>
       <property name="ant.home" value="."/>
       <property name="debug" value="on"/>
  @@ -125,11 +125,40 @@
       </target>
   
       <!-- =================================================================== -->
  +    <!-- Check for the javax classes -->
  +    <!-- =================================================================== -->
  +    <target name="check_for_jta">
  +        <available property="jta.present"
  +           classname="javax.transaction.UserTransaction">
  +              <classpath refid="classpath"/>           
  +        </available>
  +    </target>
  +
  +    <target 
  +        name="jta_prepare" depends="check_for_jta" 
  +        unless="jta.present"
  +    >
  +        <echo>
  +              Sun Microsystems Corporation 
  +              forbids redistribution of the Java Transaction API package
  +              unless it is bundled in a binary distribution.
  +
  +              So, if you want to compile Jetspeed, you will have
  +              to download separately the jta.jar binary from
  +
  +              http://java.sun.com/products/jta/
  +
  +              and ensure that it is in the lib/ directory.
  +        </echo>
  +        <fail>Java Transaction API not found</fail>
  +    </target>
  +    
  +    <!-- =================================================================== -->
       <!-- Compiles the class files                                            -->
       <!-- =================================================================== -->
       <target 
           name="compile"  
  -        depends="init"
  +        depends="init, jta_prepare"
           description="Compiles the class files"
       >
           
  @@ -140,11 +169,10 @@
               debug="${debug}"
               deprecation="${deprecation}"
               optimize="${optimize}">            
  -	    
  +            
           </javac>
   
  -     </target>
  -	
  +     </target>  
      
       <!-- =================================================================== -->
       <!-- Creates the jar file                                               -->
  @@ -217,10 +245,7 @@
                   <exclude name="cactus.properties"/>
               </fileset>
           </copy>  
  -
       </target>    
  -
  -    
       
       <!-- =================================================================== -->
       <!-- Rebuilds everything                                                 -->
  
  
  

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


Mime
View raw message