roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r498748 - in /incubator/roller/trunk: build.xml properties.xmlf tools/roller-planet/ tools/roller-planet/roller-planet-business.jar
Date Mon, 22 Jan 2007 19:04:30 GMT
Author: agilliland
Date: Mon Jan 22 11:04:29 2007
New Revision: 498748

URL: http://svn.apache.org/viewvc?view=rev&rev=498748
Log:
change Roller Weblogger build process to use a static build of the Roller Planet library.
 this appropriately decouples the two projects so that work can be done on the Planet project
without forcing effects on the Weblogger project.

moving forward, the Planet library included in the Weblogger app should only be updated when
the Planet code has been appropriately tested and the project committers feel that an update
is warranted.


Added:
    incubator/roller/trunk/tools/roller-planet/
    incubator/roller/trunk/tools/roller-planet/roller-planet-business.jar   (with props)
Modified:
    incubator/roller/trunk/build.xml
    incubator/roller/trunk/properties.xmlf

Modified: incubator/roller/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/build.xml?view=diff&rev=498748&r1=498747&r2=498748
==============================================================================
--- incubator/roller/trunk/build.xml (original)
+++ incubator/roller/trunk/build.xml Mon Jan 22 11:04:29 2007
@@ -286,21 +286,8 @@
 <!-- Compile and jar Business Tier classes -->
 <!-- ********************************************************************* -->
 
-<!-- get jars from Roller Planet project which are required for Weblogger app -->
-<target name="get-planet-jars">
-    <!-- first call the "dist" target to make sure the libs are built -->
-    <ant antfile="apps/planet/build.xml" inheritAll="false" target="dist" />
-    
-    <!-- now just copy them to our build.lib directory for inclusion -->
-    <mkdir dir="${build.lib}"/>
-    <copy todir="${build.lib}">
-        <fileset dir="apps/planet/dist/lib" 
-                 includes="roller-planet-business.jar" />
-    </copy>
-</target>
 
-
-<target name="build-business" depends="get-planet-jars">
+<target name="build-business">
     
     <mkdir dir="${build.generated.business}"/>
     <mkdir dir="${build.compile.business}"/>
@@ -328,7 +315,6 @@
         
         <classpath>
             <path refid="business.path"/>
-            <fileset dir="${build.lib}" includes="*.jar" />
             &custom-jars;
         </classpath>
     </javac>
@@ -426,6 +412,8 @@
         <fileset refid="struts.jars" />
         <fileset refid="spring.jars" /> 
         <fileset refid="jstl.jars" />
+        
+        <fileset refid="roller-planet.jars" />
         
         <!-- include custom jars -->
         &custom-jars;

Modified: incubator/roller/trunk/properties.xmlf
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/properties.xmlf?view=diff&rev=498748&r1=498747&r2=498748
==============================================================================
--- incubator/roller/trunk/properties.xmlf (original)
+++ incubator/roller/trunk/properties.xmlf Mon Jan 22 11:04:29 2007
@@ -140,6 +140,10 @@
     <include name="*.jar"/>
 </fileset>
 
+<fileset id="roller-planet.jars" dir="${ro.tools}/roller-planet">
+    <include name="*.jar"/>
+</fileset>
+
 <!-- **************************************************************** -->
 <!-- Define path based on above filesets -->
 <!-- **************************************************************** -->
@@ -149,6 +153,7 @@
     <fileset refid="base.jars"/>
     <fileset refid="mail.jars"/>
     <fileset refid="commons.jars"/>
+    <fileset refid="roller-planet.jars" />
 </path>
 
 <path id="business.path">

Added: incubator/roller/trunk/tools/roller-planet/roller-planet-business.jar
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tools/roller-planet/roller-planet-business.jar?view=auto&rev=498748
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/trunk/tools/roller-planet/roller-planet-business.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message