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 2014/01/24 20:09:42 UTC
svn commit: r1561120 - in /manifoldcf/trunk: ./ connectors/alfresco/
site/src/documentation/content/xdocs/en_US/
site/src/documentation/content/xdocs/ja_JP/
Author: kwright
Date: Fri Jan 24 19:09:42 2014
New Revision: 1561120
URL: http://svn.apache.org/r1561120
Log:
Fix for CONNECTORS-868. Committed on behalf of Muhammed Olgun.
Removed:
manifoldcf/trunk/mvn-bootstrap.bat
manifoldcf/trunk/mvn-bootstrap.sh
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/alfresco/pom.xml
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1561120&r1=1561119&r2=1561120&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Jan 24 19:09:42 2014
@@ -3,6 +3,10 @@ $Id$
======================= 1.6-dev =====================
+CONNECTORS-868: Remove mvn-bootstrap scripts and all mention of them.
+Direct dependencies on missing artifacts are now possible.
+(Muhammed Olgun)
+
CONNECTORS-867: Make locking system more responsive to UI when
system under load. (This is not a complete fix for the issue, but rather
a pair of partial fixes.)
Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1561120&r1=1561119&r2=1561120&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Jan 24 19:09:42 2014
@@ -3960,7 +3960,13 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-opensaml">
<!-- http://maven.alfresco.com/nexus/content/groups/public/opensaml/opensaml/1.1b/opensaml-1.1b.jar -->
<!-- This dependency is for alfresco, so we use the jar alfresco has -->
- <get src="http://mirrors.ibiblio.org/maven2/xfire/opensaml/1.0.1/opensaml-1.0.1.jar" dest="lib/opensaml.jar"/>
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/opensaml"/>
+ <param name="artifact-version" value="1.1"/>
+ <param name="artifact-name" value="opensaml"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-osgi">
@@ -4056,7 +4062,13 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-xmlsec">
<!-- Alfresco dependency, so resolve it from alfresco svn -->
- <get src="http://repo1.maven.org/maven2/org/apache/santuario/xmlsec/1.4.1/xmlsec-1.4.1.jar" dest="lib/xmlsec.jar"/>
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="org/apache/santuario"/>
+ <param name="artifact-version" value="1.4.0"/>
+ <param name="artifact-name" value="xmlsec"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-xml-apis">
Modified: manifoldcf/trunk/connectors/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/pom.xml?rev=1561120&r1=1561119&r2=1561120&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/pom.xml (original)
+++ manifoldcf/trunk/connectors/alfresco/pom.xml Fri Jan 24 19:09:42 2014
@@ -154,7 +154,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
- <version>1.0.1</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
@@ -197,9 +197,9 @@
<version>1.4</version>
</dependency>
<dependency>
- <groupId>xml-security</groupId>
+ <groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
- <version>1.4.1</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1561120&r1=1561119&r2=1561120&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml (original)
+++ manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml Fri Jan 24 19:09:42 2014
@@ -257,13 +257,7 @@
<p>A canned version of all configuration files are included as resources. If you want to change the configuration in any way, you will need to rebuild with Maven accordingly.</p>
<section>
<title>Preparation</title>
- <p>Before you begin, you will need to install Maven (if you haven't already) and prepare by downloading the necessary materials to support the LGPL connector builds, just as you would for the Ant
- build described in the previous section. Then, you need to push various ManifoldCF-required jars into your local Maven repository. To do that, please do the following:</p>
- <ol>
- <li>Populate your <em>lib</em> directory with the jars necessary. You can do this either by downloading and unpacking an appropriate lib distribution, or by executing the appropriate Ant commands.
- The command <em>ant download-xerces download-xmlsec download-opensaml</em> should be sufficient.</li>
- <li>Run the script <em>mvn-bootstrap[.sh|.bat]</em>. This script takes no arguments.</li>
- </ol>
+ <p>No special preparation is required, other than to have access to the Apache Maven repository.</p>
</section>
<section>
<title>How to build</title>
Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml?rev=1561120&r1=1561119&r2=1561120&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml (original)
+++ manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml Fri Jan 24 19:09:42 2014
@@ -257,13 +257,7 @@
<p>A canned version of all configuration files are included as resources. If you want to change the configuration in any way, you will need to rebuild with Maven accordingly.</p>
<section>
<title>Preparation</title>
- <p>Before you begin, you will need to install Maven (if you haven't already) and prepare by downloading the necessary materials to support the LGPL connector builds, just as you would for the Ant
- build described in the previous section. Then, you need to push various ManifoldCF-required jars into your local Maven repository. To do that, please do the following:</p>
- <ol>
- <li>Populate your <em>lib</em> directory with the jars necessary. You can do this either by downloading and unpacking an appropriate lib distribution, or by executing the appropriate Ant commands.
- The command <em>ant download-xerces download-xmlsec download-opensaml</em> should be sufficient.</li>
- <li>Run the script <em>mvn-bootstrap[.sh|.bat]</em>. This script takes no arguments.</li>
- </ol>
+ <p>No special preparation is required, other than to have access to the Apache Maven repository.</p>
</section>
<section>
<title>How to build</title>