labs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r607066 - in /labs/droids/trunk: build.xml default.properties tools/ivy/ivy-build.xml
Date Thu, 27 Dec 2007 13:20:47 GMT
Author: thorsten
Date: Thu Dec 27 05:20:47 2007
New Revision: 607066

URL: http://svn.apache.org/viewvc?rev=607066&view=rev
Log:
Adding stripped down build file and enabling full ivy support.

Added:
    labs/droids/trunk/build.xml
      - copied, changed from r604178, labs/droids/branch/nutch/build.xml
    labs/droids/trunk/default.properties
      - copied, changed from r604178, labs/droids/branch/nutch/default.properties
Modified:
    labs/droids/trunk/tools/ivy/ivy-build.xml

Copied: labs/droids/trunk/build.xml (from r604178, labs/droids/branch/nutch/build.xml)
URL: http://svn.apache.org/viewvc/labs/droids/trunk/build.xml?p2=labs/droids/trunk/build.xml&p1=labs/droids/branch/nutch/build.xml&r1=604178&r2=607066&rev=607066&view=diff
==============================================================================
--- labs/droids/branch/nutch/build.xml (original)
+++ labs/droids/trunk/build.xml Thu Dec 27 05:20:47 2007
@@ -15,7 +15,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project name="Droids" default="droids.job">
+<project name="Droids" default="droids.compile">
   
   <!-- Load all the default properties, and any the user wants    -->
   <!-- to contribute (without having to type -D or edit this file -->
@@ -44,18 +44,7 @@
     <path refid="droids.classpath"/>
   </path>
   
-  <!-- Crawling -->
-  <path id="droids.crawl.classpath">
-    <pathelement location="${build.classes}" />
-    <pathelement location="${conf.dir}"/>
-    <pathelement location="${src.dir}"/>
-    <pathelement location="${plugins.classpath.dir}"/>
-    <fileset dir="${plugins.classpath.dir}">
-      <include name="**/*.jar" />
-    </fileset>
-    <path refid="droids.classpath"/>
-  </path>
-
+  
   <!-- ====================================================== -->
   <!-- Stuff needed by all targets                            -->
   <!-- ====================================================== -->
@@ -67,7 +56,7 @@
   <!-- ====================================================== -->
   <!-- Compile the Java files                                 -->
   <!-- ====================================================== -->
-  <target name="droids.compile" depends="droids.compile-core, droids.compile-plugins"
description="--> Will compile/deploy all plugins and the droids core"/>
+  <target name="droids.compile" depends="droids.compile-core" description="--> Will
compile/deploy the droids core"/>
 
   <target name="droids.compile-core" depends="droids.init,ivy.resolve" description="-->
Will compile the droids core" >
     <javac 
@@ -84,114 +73,6 @@
     </javac>    
   </target>
 
-  <target name="droids.compile-plugins" description="--> Will compile/deploy all plugins">
-    <ant dir="${plugins.dir}" target="droids.deploy" inheritAll="false"/>
-  </target>
-
-  <target name="droids.crawl" description="--> Will invoke the crawling.">
-    <java classname="org.apache.droids.Cli" fork="true" dir="${build.dir}"
-      maxmemory="${droids.maxmemory}" failonerror="true"
-      resultproperty="buildResult">
-      <arg value="${droids.name}"/>
-      <arg value="${droids.initial.url}"/>
-      <classpath>
-        <path refid="droids.crawl.classpath"/>
-      </classpath>
-    </java>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- Make droids.jar                                                     -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
-  <target name="droids.jar" depends="droids.compile-core" description="--> Make droids.jar">
-    <copy todir="${build.classes}">
-      <fileset dir="${conf.dir}" includes="**/*.xml,**/*.txt,**/*.xsl"/>
-    </copy>
-    <jar jarfile="${build.dir}/${final.name}.jar"
-         basedir="${build.classes}">
-      <manifest>
-        <attribute name="Main-Class" value="org.apache.droids.Cli"/>
-        <section name="org/apache/droids/">
-          <attribute name="Comment" value="Support classes for Apache Droids"/>
-          <attribute name="Implementation-Title" value="org.apache.droids"/>
-          <attribute name="Implementation-Version" value="${final.name} "/> 
-          <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-          <attribute name="Implementation-URL" value="http://labs.apache.org/droids/"/>
-        </section>
-      </manifest>
-    </jar>
-  </target>
-  <!-- ================================================================== -->
-  <!-- Make job jar                                                       -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
-  <target name="droids.job" depends="droids.compile" description="--> Make job jar
">
-    <jar jarfile="${build.dir}/${final.name}.job">
-      <zipfileset dir="${build.classes}"/>
-      <zipfileset dir="${conf.dir}" excludes="*.template"/>
-      <zipfileset dir="${lib.dir}" prefix="lib"
-                  includes="**/*.jar" />
-      <zipfileset dir="${build.plugins}" prefix="plugins"/>
-      <manifest>
-        <attribute name="Main-Class" value="org.apache.droids.Cli"/>
-        <attribute name="Class-Path" value="${final.name}.job/lib/commons-logging.jar"/>
-        <section name="org/apache/droids/">
-          <attribute name="Comment" value="Support classes for Apache Droids"/>
-          <attribute name="Implementation-Title" value="org.apache.droids"/>
-          <attribute name="Implementation-Version" value="${final.name} "/> 
-          <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-          <attribute name="Implementation-URL" value="http://labs.apache.org/droids/"/>
-        </section>
-      </manifest>
-    </jar>
-  </target>
-  <!-- ================================================================== -->
-  <!-- Documentation                                                      -->
-  <!-- ================================================================== -->
-  <target name="droids.javadoc" depends="droids.compile" description="--> Documentation
javadocs">
-    <mkdir dir="${build.javadoc}"/>
-    <javadoc
-      overview="${src.dir}/overview.html"
-      destdir="${build.javadoc}"
-      author="true"
-      version="true"
-      use="true"
-      windowtitle="${Name} ${version} API"
-      doctitle="${Name} ${version} API"
-      bottom="Copyright &amp;copy; ${year} The Apache Software Foundation"
-      >
-        <arg value="${javadoc.proxy.host}"/>
-        <arg value="${javadoc.proxy.port}"/>
-
-      <packageset dir="${src.dir}"/>
-      <!--FIXME: this should be done by traversing the plugin dir 
-    which removes the need to patch this file when a new plugin will 
-    be released-->
-      <packageset dir="${plugins.dir}/handle-log/src/java"/>
-      <packageset dir="${plugins.dir}/handle-save/src/java"/>
-      <packageset dir="${plugins.dir}/parse-html/src/java"/>
-      <packageset dir="${plugins.dir}/protocol-http/src/java"/>
-      <packageset dir="${plugins.dir}/urlfilter-regex/src/java"/>
-      <link href="${javadoc.link.java}"/>
-      
-      <classpath refid="droids.classpath"/>
-    	<classpath>
-    		<fileset dir="${plugins.dir}" >
-    			<include name="**/*.jar"/>
-    		</fileset>
-    	</classpath>
-    	
-      <group title="Core" packages="org.apache.droids.*"/>
-      <group title="Plugins API" packages="${plugins.api}"/>
-      <group title="Parse Plugins" packages="${plugins.parse}"/>
-      <group title="Protocol Plugins" packages="${plugins.protocol}"/>
-      <group title="Urlfilter Plugins" packages="${plugins.urlfilter}"/>
-    </javadoc>
-  </target>	
-	
   <!-- Clean.  Delete the build files, and their directories              -->
   <!-- ================================================================== -->
   <target name="droids.clean" description="--> Delete the build files, and their directories">

Copied: labs/droids/trunk/default.properties (from r604178, labs/droids/branch/nutch/default.properties)
URL: http://svn.apache.org/viewvc/labs/droids/trunk/default.properties?p2=labs/droids/trunk/default.properties&p1=labs/droids/branch/nutch/default.properties&r1=604178&r2=607066&rev=607066&view=diff
==============================================================================
--- labs/droids/branch/nutch/default.properties (original)
+++ labs/droids/trunk/default.properties Thu Dec 27 05:20:47 2007
@@ -38,7 +38,6 @@
 src.dir = ./src/java
 lib.dir = ./lib
 conf.dir = ./conf
-plugins.dir = ./src/plugins
 docs.dir = ./docs
 docs.src = ${basedir}/src/web
 xmlcatalog.dir = ${basedir}/src/xmlcatalog
@@ -59,46 +58,9 @@
 
 javacc.home=/usr/java/javacc
 
-web.src.dir = ./src/web
-src.webapps = ./src/webapps
-
-# Proxy Host and Port to use for building JavaDoc
-javadoc.proxy.host=-J-DproxyHost=
-javadoc.proxy.port=-J-DproxyPort=
-javadoc.link.java=http://java.sun.com/j2se/1.4.2/docs/api/
-javadoc.link.lucene=http://jakarta.apache.org/lucene/docs/api/
-javadoc.link.hadoop=http://lucene.apache.org/hadoop/docs/api/
-javadoc.packages=org.apache.droids.*
-
 dist.dir=${build.dir}/${final.name}
 
 javac.debug=on
 javac.optimize=on
 javac.deprecation=off
 javac.version= 1.5
-
-#
-# Plugins API
-#
-plugins.api=org.apache.droids.protocol.http.api*
-
-#
-# Protocol Plugins
-#
-plugins.protocol=org.apache.droids.protocol.http*
-
-#
-# URL Filter Plugins
-#
-plugins.urlfilter=org.apache.droids.urlfilter.regex*
-
-
-#
-# Parse Plugins
-#
-plugins.parse=org.apache.droids.parse.html*
-
-#
-# Handle Plugins
-#
-plugins.parse=org.apache.droids.handle*

Modified: labs/droids/trunk/tools/ivy/ivy-build.xml
URL: http://svn.apache.org/viewvc/labs/droids/trunk/tools/ivy/ivy-build.xml?rev=607066&r1=607065&r2=607066&view=diff
==============================================================================
--- labs/droids/trunk/tools/ivy/ivy-build.xml (original)
+++ labs/droids/trunk/tools/ivy/ivy-build.xml Thu Dec 27 05:20:47 2007
@@ -3,6 +3,15 @@
   default="ivy.resolve">
   <property file="build.properties"/>
   <property name="project.build.dir" location="build"/>
+  <!-- The ivy classpath -->
+  <path id="ivy.classpath">
+    <fileset dir="${ivy.repository.dir}">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+  
+  <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
+    uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.classpath"/>
   <target name="ivy.configure">
     <ivy:configure file="${ivy.repository.dir}/ivyconf.xml"/>
   </target>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org


Mime
View raw message