lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From busc...@apache.org
Subject svn commit: r596501 - in /lucene/java/trunk: CHANGES.txt build.xml common-build.xml contrib/gdata-server/ src/site/src/documentation/content/xdocs/site.xml
Date Tue, 20 Nov 2007 00:46:30 GMT
Author: buschmi
Date: Mon Nov 19 16:46:27 2007
New Revision: 596501

URL: http://svn.apache.org/viewvc?rev=596501&view=rev
Log:
LUCENE-1055: Remove gdata from trunk.

Removed:
    lucene/java/trunk/contrib/gdata-server/
Modified:
    lucene/java/trunk/CHANGES.txt
    lucene/java/trunk/build.xml
    lucene/java/trunk/common-build.xml
    lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml

Modified: lucene/java/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?rev=596501&r1=596500&r2=596501&view=diff
==============================================================================
--- lucene/java/trunk/CHANGES.txt (original)
+++ lucene/java/trunk/CHANGES.txt Mon Nov 19 16:46:27 2007
@@ -1,4 +1,4 @@
-Lucene Change Log
+Lucene Change Log
 $Id$
 
 ======================= Trunk (not yet released) =======================
@@ -282,6 +282,9 @@
     the url to a maven remote repository to deploy to. (Michael Busch)
 
  5. LUCENE-1051: Include javadocs in the maven artifacts. (Michael Busch)
+
+ 6. LUCENE-1055: Remove gdata-server from build files and its sources 
+    from trunk. (Michael Busch)
 
 Test Cases
 

Modified: lucene/java/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/build.xml?rev=596501&r1=596500&r2=596501&view=diff
==============================================================================
--- lucene/java/trunk/build.xml (original)
+++ lucene/java/trunk/build.xml Mon Nov 19 16:46:27 2007
@@ -217,16 +217,6 @@
   	
   <target name="javadocs-all" description="Generate javadoc for core, demo and contrib
classes" depends="build-contrib">
   	<sequential>
-      <dirset dir="contrib/gdata-server/src/core/src/java" id="gdata-server-core">
-        <include name="**" if="build-1-5-contrib" />
-      </dirset>
-      <dirset dir="contrib/gdata-server/src/gom/src/java" id="gdata-server-gom">
-        <include name="**" if="build-1-5-contrib" />
-      </dirset>
-      <dirset dir="contrib/gdata-server/src/hivemind/src/java" id="gdata-server-hivemind">
-        <include name="**" if="build-1-5-contrib" />
-      </dirset>
-  		
       <mkdir dir="${javadoc.dir}"/>
       <invoke-javadoc
         destdir="${javadoc.dir}">
@@ -237,9 +227,8 @@
           <packageset dir="src/demo"/>
 
           <!-- please keep this list up to date, and in alpha order...   -->
-          <!-- with the minor exception of gdata which is managed by ref -->
         
-          <!-- ie: `find contrib/* -path \*src/java | grep -v gdata | sort` -->
+          <!-- ie: `find contrib/* -path \*src/java | sort` -->
 
           <!-- if you make changes to the list of package sets, also -->
           <!-- make sure the group list below is updated.            -->
@@ -264,9 +253,6 @@
           <packageset dir="contrib/wordnet/src/java"/>
           <packageset dir="contrib/xml-query-parser/src/java"/>
           <!-- end alpha sort -->
-          <packageset refid="gdata-server-core" />
-          <packageset refid="gdata-server-gom" />
-          <packageset refid="gdata-server-hivemind" />
 
           <!-- If the main javadoc Group listing includes an "Other   -->
           <!-- Packages" group after the ones listed here, then those -->
@@ -281,7 +267,6 @@
           <group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
           <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
           <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
-          <group title="contrib: GData Server (Java1.5)" packages="org.apache.lucene.gdata.*"/>
           <group title="contrib: Lucli" packages="lucli*"/>
           <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
           <group title="contrib: Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>

Modified: lucene/java/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/common-build.xml?rev=596501&r1=596500&r2=596501&view=diff
==============================================================================
--- lucene/java/trunk/common-build.xml (original)
+++ lucene/java/trunk/common-build.xml Mon Nov 19 16:46:27 2007
@@ -56,11 +56,6 @@
   <path id="javadoc.classpath">
     <path refid="classpath"/>
     <pathelement location="${ant.home}/lib/ant.jar"/>
-
-  	<!-- NOTE: gdata jars only used with jdk 5 but include them even for lower jdk -->
-    <fileset dir="${common.dir}/contrib">
-        <include name="**/*.jar"/>
-    </fileset>
   </path>
 	
   <property name="project.name" value="site"/> <!-- todo: is this used by anakia
or something else? -->
@@ -528,6 +523,7 @@
 
 
 </project>
+
 
 
 

Modified: lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml?rev=596501&r1=596500&r2=596501&view=diff
==============================================================================
--- lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml (original)
+++ lucene/java/trunk/src/site/src/documentation/content/xdocs/site.xml Mon Nov 19 16:46:27
2007
@@ -58,9 +58,6 @@
 		    <javadoc-contrib-bdb label="Bdb" href="ext:javadocs-contrib-bdb"/>
 		    <javadoc-contrib-bdb-je label="Bdb-je" href="ext:javadocs-contrib-bdb-je"/>
 		    <javadoc-contrib-benchmark label="Benchmark" href="ext:javadocs-contrib-benchmark"/>
-<!--
-		    <javadoc-contrib-gdata label="GData" href="ext:javadocs-contrib-gdata"/>
--->
 		    <javadoc-contrib-highlighter label="Highlighter" href="ext:javadocs-contrib-highlighter"/>
 		    <javadoc-contrib-lucli label="Lucli" href="ext:javadocs-contrib-lucli"/>
 		    <javadoc-contrib-memory label="Memory" href="ext:javadocs-contrib-memory"/>
@@ -134,7 +131,6 @@
 	<javadocs-contrib-bdb href="api/contrib-bdb/index.html"/>
 	<javadocs-contrib-bdb-je href="api/contrib-bdb-je/index.html"/>
 	<javadocs-contrib-benchmark href="api/contrib-benchmark/index.html"/>
-	<javadocs-contrib-gdata href="api/contrib-gdata/index.html"/>
 	<javadocs-contrib-highlighter href="api/contrib-highlighter/index.html"/>
 	<javadocs-contrib-lucli href="api/contrib-lucli/index.html"/>
 	<javadocs-contrib-memory href="api/contrib-memory/index.html"/>



Mime
View raw message