You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2011/03/18 19:06:51 UTC
svn commit: r1082998 - in /lucene/dev/trunk/solr: build.xml
site/tutorial.html src/site/src/documentation/resources/schema/catalog.xcat
src/site/src/documentation/skinconf.xml
Author: hossman
Date: Fri Mar 18 18:06:51 2011
New Revision: 1082998
URL: http://svn.apache.org/viewvc?rev=1082998&view=rev
Log:
SOLR-2434: eliminate version injection into forrest docs, and remove build-site from prepare-release's dependency chain (it was fundementally flawed since the build requires java 1.6 but forrest only works with java 1.5)
Modified:
lucene/dev/trunk/solr/build.xml
lucene/dev/trunk/solr/site/tutorial.html
lucene/dev/trunk/solr/src/site/src/documentation/resources/schema/catalog.xcat
lucene/dev/trunk/solr/src/site/src/documentation/skinconf.xml
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1082998&r1=1082997&r2=1082998&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Fri Mar 18 18:06:51 2011
@@ -83,35 +83,6 @@
</delete>
</target>
- <!-- Prepares an entity file for use in Forrest documentation -->
- <target name="init-forrest-entities">
- <!-- no description, don't advertise -->
-
- <!-- Building off Lucene trunk, we don't need this
- <available file="lib/lucene-core-${version}.jar"
- property="lucene-version-ok-m2deploy-wont-fail" />
- <fail unless="lucene-version-ok-m2deploy-wont-fail">
- lib/lucene-core-${version}.jar Missing
-
- lib/lucene-core-${version}.jar does not exist.
- This will cause problems with m2-deploy later, so fail fast now.
-
- Probably cause: lucene jars were upgraded w/o modifying the
- 'version' property in common-build.xml
- </fail>
- -->
-
- <mkdir dir="${dest}" />
-
- <!-- A folder containing the expanded war file -->
- <mkdir dir="${dest}/web" />
-
- <echo file="${dest}/solr-specific-forrest-variables.ent" append="false">
- <!ENTITY solr.specversion "${specversion}">
- </echo>
- </target>
-
-
<!-- ========================================================================= -->
<!-- ===================== COMPILATION-RELATED TASKS ========================= -->
<!-- ========================================================================= -->
@@ -126,7 +97,7 @@
<target name="compile-solrj"
description="Compile the java client."
- depends="init-forrest-entities, compile-lucene">
+ depends="compile-lucene">
<solr-javac destdir="${dest}/solrj"
classpathref="compile.classpath">
@@ -149,7 +120,7 @@
<!-- Compile the project. -->
<target name="compile"
description="Compile the source code."
- depends="validate-solr, compile-solrj,init-forrest-entities">
+ depends="validate-solr, compile-solrj">
<solr-javac destdir="${dest}/solr"
classpathref="compile.classpath.solrj">
@@ -382,7 +353,7 @@
<!-- Run core unit tests. -->
<target name="test-core"
description="Runs the core unit tests."
- depends="init-forrest-entities, compileTests, junit" />
+ depends="compileTests, junit" />
<!-- Run contrib unit tests. -->
<target name="test"
@@ -602,7 +573,7 @@
<!-- Creates the Solr distribution files. -->
<target name="dist"
description="Creates the Solr distribution files."
- depends="init-forrest-entities, dist-solrj, dist-jar, dist-contrib, dist-war" />
+ depends="dist-solrj, dist-jar, dist-contrib, dist-war" />
<!-- Creates the Solr WAR file. -->
<target name="dist-war"
@@ -724,7 +695,7 @@
<target name="example"
description="Creates a runnable example configuration."
- depends="init-forrest-entities,compile-lucene,dist-contrib,dist-war,example-contrib">
+ depends="compile-lucene,dist-contrib,dist-war,example-contrib">
<copy file="${dist}/${fullnamever}.war"
tofile="${example}/webapps/${ant.project.name}.war"/>
<jar destfile="${example}/exampledocs/post.jar"
@@ -913,30 +884,21 @@
</target>
- <target name="build-site" depends="svn-up, init-forrest-entities" description="Prototype Helper for Committers. Assumes SVN is in the path">
- <delete dir="src/site/build"/>
- <exec executable="forrest" dir="src/site"/>
- <copy todir="site">
- <fileset dir="src/site/build/site"/>
- </copy>
- <exec executable="svn" dir="site">
- <arg value="ci"/>
- <arg value="-m"/>
- <arg value=""Forrest Entity updates""/>
- </exec>
- <exec executable="svn" dir="src/site">
- <arg value="ci"/>
- <arg value="-m"/>
- <arg value=""Forrest Entity updates""/>
- </exec>
+ <target name="build-site" depends="svn-up"
+ description="Prototype Helper for Committers. Assumes SVN is in the path">
+ <delete dir="src/site/build"/>
+ <exec executable="forrest" dir="src/site"/>
+ <copy todir="site">
+ <fileset dir="src/site/build/site"/>
+ </copy>
<antcall target="svn-up"/>
-
+
+ </target>
+ <target name="svn-up">
+ <exec executable="svn">
+ <arg value="update"/>
+ </exec>
</target>
- <target name="svn-up">
- <exec executable="svn">
- <arg value="update"/>
- </exec>
- </target>
<target name="clean-package-signatures">
<delete failonerror="false">
@@ -976,7 +938,7 @@
<sign-artifact input.file="${maven.dist.prefix}/solr-parent/${version}/solr-parent-${version}.pom" gpg.passphrase="${gpg.passphrase}"/>
</target>
- <target name="prepare-release" depends="clean, svn-up, build-site, package, sign-artifacts"
+ <target name="prepare-release" depends="clean, svn-up, package, sign-artifacts"
description="Prototype helper for Committers. Assumes gpg is in the path"/>
<target name="generate-maven-artifacts" depends="maven.ant.tasks-check,dist,dist-src,dist-javadoc">
Modified: lucene/dev/trunk/solr/site/tutorial.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/site/tutorial.html?rev=1082998&r1=1082997&r2=1082998&view=diff
==============================================================================
--- lucene/dev/trunk/solr/site/tutorial.html (original)
+++ lucene/dev/trunk/solr/site/tutorial.html Fri Mar 18 18:06:51 2011
@@ -5,7 +5,7 @@
<meta content="Apache Forrest" name="Generator">
<meta name="Forrest-version" content="0.8">
<meta name="Forrest-skin-name" content="lucene">
-<title>Solr tutorial (version 4.0.0.2011.03.12.13.42.00)</title>
+<title>Solr tutorial</title>
<link type="text/css" href="skin/basic.css" rel="stylesheet">
<link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
<link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
@@ -192,10 +192,7 @@ document.write("Last Published: " + docu
}
}
</script>
-<div id="credit">
-<hr>
- This document is for Apache Solr version 4.0.0.2011.03.12.13.42.00. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
- </div>
+<div id="credit"></div>
<div id="roundbottom">
<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
<!--+
@@ -217,9 +214,6 @@ document.write("Last Published: " + docu
PDF</a>
</div>
<h1>Solr tutorial</h1>
-<div id="motd-area">
- This document is for Apache Solr version 4.0.0.2011.03.12.13.42.00. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
- </div>
<div id="minitoc-area">
<ul class="minitoc">
<li>
Modified: lucene/dev/trunk/solr/src/site/src/documentation/resources/schema/catalog.xcat
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/site/src/documentation/resources/schema/catalog.xcat?rev=1082998&r1=1082997&r2=1082998&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/site/src/documentation/resources/schema/catalog.xcat (original)
+++ lucene/dev/trunk/solr/src/site/src/documentation/resources/schema/catalog.xcat Fri Mar 18 18:06:51 2011
@@ -21,6 +21,5 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
prefer="public">
<!-- Sets of symbols. e.g. for string replacements -->
- <public publicId="-//Apache Solr//ENTITIES Symbols Project v1.0//EN"
- uri="../../../../../../build/solr-specific-forrest-variables.ent"/>
+
</catalog>
Modified: lucene/dev/trunk/solr/src/site/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/site/src/documentation/skinconf.xml?rev=1082998&r1=1082997&r2=1082998&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/site/src/documentation/skinconf.xml (original)
+++ lucene/dev/trunk/solr/src/site/src/documentation/skinconf.xml Fri Mar 18 18:06:51 2011
@@ -21,12 +21,7 @@ Skin configuration file. This file conta
which will be used to configure the chosen Forrest skin.
-->
-<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.7-1//EN" "http://forrest.apache.org/dtd/skinconfig-v07-1.dtd" [
-<!ENTITY % symbols-project
- PUBLIC "-//Apache Solr//ENTITIES Symbols Project v1.0//EN"
- "solr-specific-forrest-variables.ent">
- %symbols-project;
-]>
+<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.7-1//EN" "http://forrest.apache.org/dtd/skinconfig-v07-1.dtd">
<skinconfig>
<!-- To enable lucene search add provider="lucene" (default is google).
Add box-location="alt" to move the search box to an alternate location
@@ -156,16 +151,6 @@ which will be used to configure the chos
both : both
-->
- <motd>
- <motd-option pattern="tutorial">
- <motd-title>version &solr.specversion;</motd-title>
- <motd-page location="both">
- This document is for Apache Solr version &solr.specversion;. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
- </motd-page>
- </motd-option>
- </motd>
-
-
<!--
extra-css - here you can define custom css-elements that are
A) overriding the fallback elements or