Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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) 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1082998 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2011-03-18 18:06:51 +00:00
parent e530e1d68e
commit cb326421ba
4 changed files with 23 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
solr/build.xml
View File

@ -83,35 +83,6 @@
</delete> </delete>
</target> </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">
&lt;!ENTITY solr.specversion "${specversion}"&gt;
</echo>
</target>
<!-- ========================================================================= --> <!-- ========================================================================= -->
<!-- ===================== COMPILATION-RELATED TASKS ========================= --> <!-- ===================== COMPILATION-RELATED TASKS ========================= -->
<!-- ========================================================================= --> <!-- ========================================================================= -->
@ -126,7 +97,7 @@
<target name="compile-solrj" <target name="compile-solrj"
description="Compile the java client." description="Compile the java client."
depends="init-forrest-entities, compile-lucene"> depends="compile-lucene">
<solr-javac destdir="${dest}/solrj" <solr-javac destdir="${dest}/solrj"
classpathref="compile.classpath"> classpathref="compile.classpath">
@ -149,7 +120,7 @@
<!-- Compile the project. --> <!-- Compile the project. -->
<target name="compile" <target name="compile"
description="Compile the source code." description="Compile the source code."
depends="validate-solr, compile-solrj,init-forrest-entities"> depends="validate-solr, compile-solrj">
<solr-javac destdir="${dest}/solr" <solr-javac destdir="${dest}/solr"
classpathref="compile.classpath.solrj"> classpathref="compile.classpath.solrj">
@ -382,7 +353,7 @@
<!-- Run core unit tests. --> <!-- Run core unit tests. -->
<target name="test-core" <target name="test-core"
description="Runs the core unit tests." description="Runs the core unit tests."
depends="init-forrest-entities, compileTests, junit" /> depends="compileTests, junit" />
<!-- Run contrib unit tests. --> <!-- Run contrib unit tests. -->
<target name="test" <target name="test"
@ -602,7 +573,7 @@
<!-- Creates the Solr distribution files. --> <!-- Creates the Solr distribution files. -->
<target name="dist" <target name="dist"
description="Creates the Solr distribution files." 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. --> <!-- Creates the Solr WAR file. -->
<target name="dist-war" <target name="dist-war"
@ -724,7 +695,7 @@
<target name="example" <target name="example"
description="Creates a runnable example configuration." 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" <copy file="${dist}/${fullnamever}.war"
tofile="${example}/webapps/${ant.project.name}.war"/> tofile="${example}/webapps/${ant.project.name}.war"/>
<jar destfile="${example}/exampledocs/post.jar" <jar destfile="${example}/exampledocs/post.jar"
@ -913,30 +884,21 @@
</target> </target>
<target name="build-site" depends="svn-up, init-forrest-entities" description="Prototype Helper for Committers. Assumes SVN is in the path"> <target name="build-site" depends="svn-up"
<delete dir="src/site/build"/> description="Prototype Helper for Committers. Assumes SVN is in the path">
<exec executable="forrest" dir="src/site"/> <delete dir="src/site/build"/>
<copy todir="site"> <exec executable="forrest" dir="src/site"/>
<fileset dir="src/site/build/site"/> <copy todir="site">
</copy> <fileset dir="src/site/build/site"/>
<exec executable="svn" dir="site"> </copy>
<arg value="ci"/>
<arg value="-m"/>
<arg value="&quot;Forrest Entity updates&quot;"/>
</exec>
<exec executable="svn" dir="src/site">
<arg value="ci"/>
<arg value="-m"/>
<arg value="&quot;Forrest Entity updates&quot;"/>
</exec>
<antcall target="svn-up"/> <antcall target="svn-up"/>
</target>
<target name="svn-up">
<exec executable="svn">
<arg value="update"/>
</exec>
</target> </target>
<target name="svn-up">
<exec executable="svn">
<arg value="update"/>
</exec>
</target>
<target name="clean-package-signatures"> <target name="clean-package-signatures">
<delete failonerror="false"> <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}"/> <sign-artifact input.file="${maven.dist.prefix}/solr-parent/${version}/solr-parent-${version}.pom" gpg.passphrase="${gpg.passphrase}"/>
</target> </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"/> 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"> <target name="generate-maven-artifacts" depends="maven.ant.tasks-check,dist,dist-src,dist-javadoc">

10
solr/site/tutorial.html
View File

@ -5,7 +5,7 @@
<meta content="Apache Forrest" name="Generator"> <meta content="Apache Forrest" name="Generator">
<meta name="Forrest-version" content="0.8"> <meta name="Forrest-version" content="0.8">
<meta name="Forrest-skin-name" content="lucene"> <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 type="text/css" href="skin/basic.css" rel="stylesheet">
<link media="screen" type="text/css" href="skin/screen.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"> <link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
@ -192,10 +192,7 @@ document.write("Last Published: " + document.lastModified);
} }
} }
</script> </script>
<div id="credit"> <div id="credit"></div>
<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="roundbottom"> <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> <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: " + document.lastModified);
PDF</a> PDF</a>
</div> </div>
<h1>Solr tutorial</h1> <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"> <div id="minitoc-area">
<ul class="minitoc"> <ul class="minitoc">
<li> <li>

3
solr/src/site/src/documentation/resources/schema/catalog.xcat
View File

@ -21,6 +21,5 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
prefer="public"> prefer="public">
<!-- Sets of symbols. e.g. for string replacements --> <!-- 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> </catalog>

17
solr/src/site/src/documentation/skinconf.xml
View File

@ -21,12 +21,7 @@ Skin configuration file. This file contains details of your project,
which will be used to configure the chosen Forrest skin. 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" [ <!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;
]>
<skinconfig> <skinconfig>
<!-- To enable lucene search add provider="lucene" (default is google). <!-- To enable lucene search add provider="lucene" (default is google).
Add box-location="alt" to move the search box to an alternate location Add box-location="alt" to move the search box to an alternate location
@ -156,16 +151,6 @@ which will be used to configure the chosen Forrest skin.
both : both 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 extra-css - here you can define custom css-elements that are
A) overriding the fallback elements or A) overriding the fallback elements or