You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/09/21 16:40:42 UTC
svn commit: r1388531 - in /manifoldcf/branches/release-1.0-branch: ./
connectors/solr/integration/ dist-license/
framework/crawler-ui/src/main/webapp/ lib-license/ site/
site/src/documentation/
Author: kwright
Date: Fri Sep 21 14:40:41 2012
New Revision: 1388531
URL: http://svn.apache.org/viewvc?rev=1388531&view=rev
Log:
Pull up fix for CONNECTORS-532 from trunk.
Modified:
manifoldcf/branches/release-1.0-branch/ (props changed)
manifoldcf/branches/release-1.0-branch/CHANGES.txt
manifoldcf/branches/release-1.0-branch/DEPENDENCIES.txt
manifoldcf/branches/release-1.0-branch/README.txt
manifoldcf/branches/release-1.0-branch/connectors/solr/integration/README-3.x.txt
manifoldcf/branches/release-1.0-branch/connectors/solr/integration/README-4.x.txt
manifoldcf/branches/release-1.0-branch/dist-license/DEPENDENCIES.txt
manifoldcf/branches/release-1.0-branch/dist-license/README.txt
manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/navigation.jsp
manifoldcf/branches/release-1.0-branch/lib-license/README.txt
manifoldcf/branches/release-1.0-branch/site/README.txt
manifoldcf/branches/release-1.0-branch/site/src/documentation/skinconf.xml
Propchange: manifoldcf/branches/release-1.0-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1388290,1388494
Modified: manifoldcf/branches/release-1.0-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/CHANGES.txt?rev=1388531&r1=1388530&r2=1388531&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.0-branch/CHANGES.txt Fri Sep 21 14:40:41 2012
@@ -3,6 +3,9 @@ $Id$
======================= 1.0 =====================
+CONNECTORS-532: Update 'incubator' and redirected URLs in various places.
+(Ahmet Arslan)
+
CONNECTORS-531: Add Japanese translation for LDAP connector
documentation.
(Shinichiro Abe)
Modified: manifoldcf/branches/release-1.0-branch/DEPENDENCIES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/DEPENDENCIES.txt?rev=1388531&r1=1388530&r2=1388531&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/DEPENDENCIES.txt (original)
+++ manifoldcf/branches/release-1.0-branch/DEPENDENCIES.txt Fri Sep 21 14:40:41 2012
@@ -9,7 +9,7 @@ ManifoldCF requires
For building ManifoldCF:
----------------------
-* Read the documentation at http://incubator.apache.org/connectors/how-to-build-and-deploy.html
+* Read the "how-to-build-and-deploy.html" documentation page
For testing ManifoldCF:
----------------------
Modified: manifoldcf/branches/release-1.0-branch/README.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/README.txt?rev=1388531&r1=1388530&r2=1388531&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/README.txt (original)
+++ manifoldcf/branches/release-1.0-branch/README.txt Fri Sep 21 14:40:41 2012
@@ -16,12 +16,11 @@
Welcome to the Apache ManifoldCF project!
-----------------------------------------
-Apache ManifoldCF is a multi-repository crawler framework, with multiple connectors,
-under incubation.
+Apache ManifoldCF is a multi-repository crawler framework, with multiple connectors.
For a complete description of the ManifoldCF project, team composition, source
code repositories, and other details, please see the ManifoldCF web site at
-http://incubator.apache.org/connectors
+http://manifoldcf.apache.org
Instructions for Building Apache ManifoldCF from Source
-----------------------------------------------------
@@ -33,7 +32,7 @@ Instructions for Building Apache Manifol
3. Copy the lib folder in the lib distribution into the source distribution.
-4. Download the Java SE 6 JDK (Java Development Kit), or greater, from http://java.sun.com.
+4. Download the Java SE 6 JDK (Java Development Kit), or greater, from http://www.oracle.com/technetwork/java/index.html.
You will need the JDK installed, and the %JAVA_HOME%\bin directory included
on your command path. To test this, issue a "java -version" command from your
shell and verify that the Java version is 1.6 or greater.
@@ -120,5 +119,5 @@ Contact
-------
o For general information visit the main project site at
- http://incubator.apache.org/connectors
+ http://manifoldcf.apache.org
Modified: manifoldcf/branches/release-1.0-branch/connectors/solr/integration/README-3.x.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/connectors/solr/integration/README-3.x.txt?rev=1388531&r1=1388530&r2=1388531&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/connectors/solr/integration/README-3.x.txt (original)
+++ manifoldcf/branches/release-1.0-branch/connectors/solr/integration/README-3.x.txt Fri Sep 21 14:40:41 2012
@@ -18,8 +18,9 @@ Getting Started
---------------
There are two ways to hook up security to Solr in this package. The first is using a Query Parser plugin.
-The second is using a Search Component. In both cases, the first step is to have ManifoldCF installed and running. See:
-http://incubator.apache.org/incubator/connectors/how-to-build-and-deploy.html
+The second is using a Search Component. In both cases, the first step is to have ManifoldCF installed and running.
+Further information can be found on the "how-to-build-and-deploy.html" documentation page.
+
Then, you will need to add fields to your Solr schema.xml file that can be used to contain document
authorization information. There will need to be four of these fields, an 'allow' field for both
Modified: manifoldcf/branches/release-1.0-branch/connectors/solr/integration/README-4.x.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/connectors/solr/integration/README-4.x.txt?rev=1388531&r1=1388530&r2=1388531&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/connectors/solr/integration/README-4.x.txt (original)
+++ manifoldcf/branches/release-1.0-branch/connectors/solr/integration/README-4.x.txt Fri Sep 21 14:40:41 2012
@@ -18,8 +18,9 @@ Getting Started
---------------
There are two ways to hook up security to Solr in this package. The first is using a Query Parser plugin.
-The second is using a Search Component. In both cases, the first step is to have ManifoldCF installed and running. See:
-http://incubator.apache.org/incubator/connectors/how-to-build-and-deploy.html
+The second is using a Search Component. In both cases, the first step is to have ManifoldCF installed and running.
+Further information can be found on the "how-to-build-and-deploy.html" documentation page.
+
Then, you will need to add fields to your Solr schema.xml file that can be used to contain document
authorization information. There will need to be four of these fields, an 'allow' field for both
Modified: manifoldcf/branches/release-1.0-branch/dist-license/DEPENDENCIES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/dist-license/DEPENDENCIES.txt?rev=1388531&r1=1388530&r2=1388531&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/dist-license/DEPENDENCIES.txt (original)
+++ manifoldcf/branches/release-1.0-branch/dist-license/DEPENDENCIES.txt Fri Sep 21 14:40:41 2012
@@ -5,6 +5,6 @@ ManifoldCF requires
For running ManifoldCF:
----------------------
-* Read the documentation at http://incubator.apache.org/connectors/how-to-build-and-deploy.html
+* Read the "how-to-build-and-deploy.html" documentation page
Modified: manifoldcf/branches/release-1.0-branch/dist-license/README.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/dist-license/README.txt?rev=1388531&r1=1388530&r2=1388531&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/dist-license/README.txt (original)
+++ manifoldcf/branches/release-1.0-branch/dist-license/README.txt Fri Sep 21 14:40:41 2012
@@ -16,12 +16,11 @@
Welcome to the Apache ManifoldCF project!
-----------------------------------------
-Apache ManifoldCF is a multi-repository crawler framework, with multiple connectors,
-under incubation.
+Apache ManifoldCF is a multi-repository crawler framework, with multiple connectors.
For a complete description of the ManifoldCF project, team composition, source
code repositories, and other details, please see the ManifoldCF web site at
-http://incubator.apache.org/connectors
+http://manifoldcf.apache.org
Getting Started
@@ -118,7 +117,7 @@ Contact
-------
o For general information visit the main project site at
- http://incubator.apache.org/connectors
+ http://manifoldcf.apache.org
=========================================================================
Modified: manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/navigation.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/navigation.jsp?rev=1388531&r1=1388530&r2=1388531&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/navigation.jsp (original)
+++ manifoldcf/branches/release-1.0-branch/framework/crawler-ui/src/main/webapp/navigation.jsp Fri Sep 21 14:40:41 2012
@@ -82,6 +82,6 @@
<p class="menumain"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"navigation.Miscellaneous")%></nobr></p>
<ul class="menusecond">
<li class="menuitem">
- <nobr><a class="menulink" href='<%="http://incubator.apache.org/connectors/"+pageContext.getRequest().getLocale().toString()+"/end-user-documentation.html"%>' alt="Help"><%=Messages.getString(pageContext.getRequest().getLocale(),"navigation.Help")%></a></nobr>
+ <nobr><a class="menulink" href='<%="http://manifoldcf.apache.org/release/trunk/"+pageContext.getRequest().getLocale().toString()+"/end-user-documentation.html"%>' alt="Help"><%=Messages.getString(pageContext.getRequest().getLocale(),"navigation.Help")%></a></nobr>
</li>
</ul>
Modified: manifoldcf/branches/release-1.0-branch/lib-license/README.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/lib-license/README.txt?rev=1388531&r1=1388530&r2=1388531&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/lib-license/README.txt (original)
+++ manifoldcf/branches/release-1.0-branch/lib-license/README.txt Fri Sep 21 14:40:41 2012
@@ -16,12 +16,11 @@
Welcome to the Apache ManifoldCF project!
-----------------------------------------
-Apache ManifoldCF is a multi-repository crawler framework, with multiple connectors,
-under incubation.
+Apache ManifoldCF is a multi-repository crawler framework, with multiple connectors.
For a complete description of the ManifoldCF project, team composition, source
code repositories, and other details, please see the ManifoldCF web site at
-http://incubator.apache.org/connectors
+http://manifoldcf.apache.org
Getting Started
@@ -95,7 +94,7 @@ Contact
-------
o For general information visit the main project site at
- http://incubator.apache.org/connectors
+ http://manifoldcf.apache.org
=========================================================================
Modified: manifoldcf/branches/release-1.0-branch/site/README.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/site/README.txt?rev=1388531&r1=1388530&r2=1388531&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/site/README.txt (original)
+++ manifoldcf/branches/release-1.0-branch/site/README.txt Fri Sep 21 14:40:41 2012
@@ -9,8 +9,8 @@ To update the site, do the following:
4. Commit the changes
- 5. For externally-viewable site publishing, copy build/site to https://svn.apache.org/repos/asf/incubator/lcf/site/publish, and commit
+ 5. For externally-viewable site publishing, copy build/site to https://svn.apache.org/repos/asf/manifoldcf/site/publish, and commit
- 6. Run "umask 002; svn up /www/incubator.apache.org/lcf"
- on people.apache.org (you'll need incubator karma for this)
+ 6. Run "umask 002; svn up /www/manifoldcf.apache.org"
+ on people.apache.org (you'll need karma for this)
Modified: manifoldcf/branches/release-1.0-branch/site/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/site/src/documentation/skinconf.xml?rev=1388531&r1=1388530&r2=1388531&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/site/src/documentation/skinconf.xml (original)
+++ manifoldcf/branches/release-1.0-branch/site/src/documentation/skinconf.xml Fri Sep 21 14:40:41 2012
@@ -67,7 +67,7 @@ which will be used to configure the chos
default skin: renders it at the top -->
<project-name>Apache ManifoldCF</project-name>
<project-description>ManifoldCF</project-description>
- <project-url>http://incubator.apache.org/connectors</project-url>
+ <project-url>http://manifoldcf.apache.org</project-url>
<project-logo>images/ManifoldCF-logo.PNG</project-logo>
<!-- Alternative static image:
<project-logo>images/project-logo.gif</project-logo> -->
@@ -103,7 +103,7 @@ which will be used to configure the chos
-->
<trail>
<link1 name="Apache" href="http://www.apache.org/"/>
- <link2 name="ManifoldCF" href="http://incubator.apache.org/connectors/"/>
+ <link2 name="ManifoldCF" href="http://manifoldcf.apache.org"/>
<link3 name="Release Documentation" href=""/>
</trail>