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 2012/03/07 01:33:56 UTC
svn commit: r1297809 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/
solr/README.txt solr/build.xml solr/core/ solr/core/src/java/doc-files/
solr/core/src/java/doc-files/tutorial.html solr/core/src/java/overview.html
solr/site-src/ solr/site/
Author: hossman
Date: Wed Mar 7 00:33:56 2012
New Revision: 1297809
URL: http://svn.apache.org/viewvc?rev=1297809&view=rev
Log:
SOLR-3183: de-forrest solr now that the website uses the Apache CMS. Move the existing forrest-to-html tutorial into the javadocs and prune it's formating/navigation (merge r1297802 from trunk)
Added:
lucene/dev/branches/branch_3x/solr/core/src/java/doc-files/
- copied from r1297806, lucene/dev/trunk/solr/core/src/java/doc-files/
lucene/dev/branches/branch_3x/solr/core/src/java/doc-files/tutorial.html
- copied, changed from r1297806, lucene/dev/trunk/solr/core/src/java/doc-files/tutorial.html
Removed:
lucene/dev/branches/branch_3x/solr/site/
lucene/dev/branches/branch_3x/solr/site-src/
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/README.txt
lucene/dev/branches/branch_3x/solr/build.xml
lucene/dev/branches/branch_3x/solr/core/ (props changed)
lucene/dev/branches/branch_3x/solr/core/src/java/overview.html
Modified: lucene/dev/branches/branch_3x/solr/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/README.txt?rev=1297809&r1=1297808&r2=1297809&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/README.txt (original)
+++ lucene/dev/branches/branch_3x/solr/README.txt Wed Mar 7 00:33:56 2012
@@ -30,9 +30,10 @@ Getting Started
See the "example" directory for an example Solr setup. A tutorial
using the example setup can be found at
-http://lucene.apache.org/solr/tutorial.html
-or in in "docs/tutorial.html" in a binary distribution.
-
+ http://lucene.apache.org/solr/tutorial.html
+or linked from "docs/api/index.html" in a binary distribution.
+Also, there are Solr clients for many programming languages, see
+ http://wiki.apache.org/solr/IntegratingSolr
Files included in an Apache Solr binary distribution
@@ -53,12 +54,8 @@ dist/apache-solr-XX.jar
Apache Solr Plugins (see http://wiki.apache.org/solr/SolrPlugins for
more information).
-docs/index.html
- The contents of the Apache Solr website.
-
docs/api/index.html
- The Apache Solr Javadoc API documentation.
-
+ The Apache Solr Javadoc API documentation and Tutorial
Instructions for Building Apache Solr from Source
Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1297809&r1=1297808&r2=1297809&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Wed Mar 7 00:33:56 2012
@@ -368,7 +368,7 @@
excludes="build ${package.dir}/** ${dist}/**
example/webapps/*.war example/exampledocs/post.jar
lib/README.committers.txt **/data/ **/logs/*
- **/*.sh **/bin/ scripts/ site-src/build/
+ **/*.sh **/bin/ scripts/
.idea/ **/*.iml **/pom.xml" />
<tarfileset dir="." prefix="${fullnamever}/solr"
includes="core/src/test-files/solr/lib/classes/empty-file-main-lib.txt" />
@@ -460,9 +460,7 @@
</target>
<target name="javadocs-dep">
- <copy failonerror="false" todir="${dest}/docs">
- <fileset dir="${common-solr.dir}/site" />
- </copy>
+ <!-- NOOP -->
</target>
<target name="javadocs-all"
@@ -628,16 +626,6 @@
</exec>
</target>
- <target name="build-site" depends="svn-up"
- description="Committers' Helper: build the site and copy to site/.">
- <delete dir="site-src/build"/>
- <exec executable="forrest" dir="site-src"/>
- <copy todir="site">
- <fileset dir="site-src/build/site"/>
- </copy>
- <antcall target="svn-up"/>
- </target>
-
<target name="svn-up">
<exec executable="${svn.exe}">
<arg value="update"/>
Copied: lucene/dev/branches/branch_3x/solr/core/src/java/doc-files/tutorial.html (from r1297806, lucene/dev/trunk/solr/core/src/java/doc-files/tutorial.html)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/doc-files/tutorial.html?p2=lucene/dev/branches/branch_3x/solr/core/src/java/doc-files/tutorial.html&p1=lucene/dev/trunk/solr/core/src/java/doc-files/tutorial.html&r1=1297806&r2=1297809&rev=1297809&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/doc-files/tutorial.html (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/doc-files/tutorial.html Wed Mar 7 00:33:56 2012
@@ -34,13 +34,13 @@ To follow along with this tutorial, you
</p>
<ol>
-<li>Java 1.6 or greater. Some places you can get it are from
+<li>Java 1.5 or greater. Some places you can get it are from
<a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">Oracle</a>,
<a href="http://openjdk.java.net/">Open JDK</a>,
<a href="http://www.ibm.com/developerworks/java/jdk/">IBM</a>, or
<br />
Running <span class="codefrag">java -version</span> at the command line should indicate a version
- number starting with 1.6. Gnu's GCJ is not supported and does not work with Solr.
+ number starting with 1.5. Gnu's GCJ is not supported and does not work with Solr.
</li>
<li>A <a href="http://www.apache.org/dyn/closer.cgi/lucene/solr/">Solr release</a>.
Modified: lucene/dev/branches/branch_3x/solr/core/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/overview.html?rev=1297809&r1=1297808&r2=1297809&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/overview.html (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/overview.html Wed Mar 7 00:33:56 2012
@@ -1,5 +1,5 @@
<html>
<body>
-Apache Solr Search Server
+Apache Solr Search Server, new users should familiarize themselves with the <a href="doc-files/tutorial.html">Solr Tutorial</a>.
</body>
</html>