lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ehatc...@apache.org
Subject svn commit: r1651562 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/example/ solr/site/ solr/site/assets/ solr/site/html/ solr/site/xsl/
Date Wed, 14 Jan 2015 03:12:34 GMT
Author: ehatcher
Date: Wed Jan 14 03:12:33 2015
New Revision: 1651562

URL: http://svn.apache.org/r1651562
Log:
SOLR-6870: overhaul/rename tutorial (merged from trunk r1651560 and r1651561)

Added:
    lucene/dev/branches/branch_5x/solr/site/SYSTEM_REQUIREMENTS.mdtext   (contents, props
changed)
      - copied, changed from r1651560, lucene/dev/trunk/solr/site/SYSTEM_REQUIREMENTS.mdtext
    lucene/dev/branches/branch_5x/solr/site/assets/
      - copied from r1651561, lucene/dev/trunk/solr/site/assets/
    lucene/dev/branches/branch_5x/solr/site/index.xsl
      - copied unchanged from r1651560, lucene/dev/trunk/solr/site/index.xsl
    lucene/dev/branches/branch_5x/solr/site/quickstart.mdtext
      - copied unchanged from r1651560, lucene/dev/trunk/solr/site/quickstart.mdtext
Removed:
    lucene/dev/branches/branch_5x/solr/SYSTEM_REQUIREMENTS.txt
    lucene/dev/branches/branch_5x/solr/site/html/
    lucene/dev/branches/branch_5x/solr/site/xsl/
Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/README.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/build.xml   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/example/   (props changed)
    lucene/dev/branches/branch_5x/solr/example/README.txt
    lucene/dev/branches/branch_5x/solr/site/   (props changed)

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1651562&r1=1651561&r2=1651562&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Wed Jan 14 03:12:33 2015
@@ -15,7 +15,7 @@ Getting Started
 You need a Java 1.7 VM or later installed.
 In this release, there is an example Solr server including a bundled 
 servlet container in the directory named "example".
-See the tutorial at http://lucene.apache.org/solr/tutorial.html
+See the Quick Start guide at http://lucene.apache.org/solr/quickstart.html
 
 ==================  5.1.0 ==================
 (No Changes)

Modified: lucene/dev/branches/branch_5x/solr/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/README.txt?rev=1651562&r1=1651561&r2=1651562&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/README.txt (original)
+++ lucene/dev/branches/branch_5x/solr/README.txt Wed Jan 14 03:12:33 2015
@@ -89,15 +89,11 @@ For more information about Solr examples
 
  * example/solr/README.txt
    For more information about the "Solr Home" and Solr specific configuration
- * http://lucene.apache.org/solr/tutorial.html
-   For a Tutorial using this example configuration
- * http://wiki.apache.org/solr/SolrResources
+ * http://lucene.apache.org/solr/quickstart.html
+   For a Quick Start guide
+ * http://lucene.apache.org/solr/resources.html
    For a list of other tutorials and introductory articles.
 
-A tutorial is available at:
-
-   http://lucene.apache.org/solr/tutorial.html
-
 or linked from "docs/index.html" in a binary distribution.
 
 Also, there are Solr clients for many programming languages, see 

Modified: lucene/dev/branches/branch_5x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/build.xml?rev=1651562&r1=1651561&r2=1651562&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/build.xml Wed Jan 14 03:12:33 2015
@@ -154,7 +154,7 @@
       so we pass ourself (${ant.file}) here. The list of module build.xmls is given
       via string parameter, that must be splitted by the XSL at '|'.
     --> 
-    <xslt in="${ant.file}" out="${javadoc.dir}/index.html" style="site/xsl/index.xsl"
force="true">
+    <xslt in="${ant.file}" out="${javadoc.dir}/index.html" style="site/index.xsl" force="true">
       <outputproperty name="method" value="html"/>
       <outputproperty name="version" value="4.0"/>
       <outputproperty name="encoding" value="UTF-8"/>
@@ -165,12 +165,12 @@
     </xslt>
     
     <pegdown todir="${javadoc.dir}">
-      <fileset dir="." includes="SYSTEM_REQUIREMENTS.txt"/>
-      <globmapper from="*.txt" to="*.html"/>
+      <fileset dir="site/"/>
+      <globmapper from="*.mdtext" to="*.html"/>
     </pegdown>
 
     <copy todir="${javadoc.dir}">
-      <fileset dir="site/html" includes="**/*"/>
+      <fileset dir="site/assets/" />
     </copy>
   </target>
 

Modified: lucene/dev/branches/branch_5x/solr/example/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/README.txt?rev=1651562&r1=1651561&r2=1651562&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/README.txt (original)
+++ lucene/dev/branches/branch_5x/solr/example/README.txt Wed Jan 14 03:12:33 2015
@@ -49,7 +49,7 @@ For more information about this example
 
  * example/solr/README.txt
    For more information about the "Solr Home" and Solr specific configuration
- * http://lucene.apache.org/solr/tutorial.html
+ * http://lucene.apache.org/solr/quickstart.html
    For a Tutorial using this example configuration
  * http://wiki.apache.org/solr/SolrResources 
    For a list of other tutorials and introductory articles.

Copied: lucene/dev/branches/branch_5x/solr/site/SYSTEM_REQUIREMENTS.mdtext (from r1651560,
lucene/dev/trunk/solr/site/SYSTEM_REQUIREMENTS.mdtext)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/site/SYSTEM_REQUIREMENTS.mdtext?p2=lucene/dev/branches/branch_5x/solr/site/SYSTEM_REQUIREMENTS.mdtext&p1=lucene/dev/trunk/solr/site/SYSTEM_REQUIREMENTS.mdtext&r1=1651560&r2=1651562&rev=1651562&view=diff
==============================================================================
--- lucene/dev/trunk/solr/site/SYSTEM_REQUIREMENTS.mdtext (original)
+++ lucene/dev/branches/branch_5x/solr/site/SYSTEM_REQUIREMENTS.mdtext Wed Jan 14 03:12:33
2015
@@ -1,6 +1,9 @@
 # System Requirements 
 
-Apache Solr runs of Java 8 or greater.
+Apache Solr runs of Java 7 or greater, Java 8 is verified to be
+compatible and may bring some performance improvements. When using
+Oracle Java 7 or OpenJDK 7, be sure to not use the GA build 147 or
+update versions u40, u45 and u51! We recommend using u55 or later.
 
 It is also recommended to always use the latest update version of your
 Java VM, because bugs may affect Solr. An overview of known JVM bugs



Mime
View raw message