Author: kwright
Date: Sun Feb 10 16:58:53 2013
New Revision: 1444564
URL: http://svn.apache.org/r1444564
Log:
No longer build xerces-mcf
Modified:
manifoldcf/branches/CONNECTORS-633/build.xml
manifoldcf/branches/CONNECTORS-633/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
manifoldcf/branches/CONNECTORS-633/mvn-bootstrap.bat
manifoldcf/branches/CONNECTORS-633/mvn-bootstrap.sh
manifoldcf/branches/CONNECTORS-633/pom.xml
Modified: manifoldcf/branches/CONNECTORS-633/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-633/build.xml?rev=1444564&r1=1444563&r2=1444564&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-633/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-633/build.xml Sun Feb 10 16:58:53 2013
@@ -3153,29 +3153,12 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-xerces">
<mkdir dir="lib"/>
- <!-- Download and build patched version of xerces 2.9.1 -->
- <mkdir dir="build/download"/>
- <delete dir="build/download/xerces2-j"/>
- <antcall target="checkout-source-via-svn">
- <param name="root-dir" value="build/download"/>
- <param name="svn-url"
value="http://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_9_1"/>
- <param name="dir-name" value="xerces2-j"/>
- </antcall>
- <!-- Apply mcf-specific features and fixes patch -->
- <antcall target="patch-source">
- <param name="root-dir" value="build/download"/>
- <param name="diff-file"
value="../../upstream-diffs/xerces2-j-2.9.1.mcf.patch"/>
- <param name="dir-name" value="xerces2-j"/>
- </antcall>
- <!-- Build it -->
- <exec dir="build/download/xerces2-j" executable="cmd"
osfamily="windows" failifexecutionfails="true" failonerror="true">
- <arg line="/c build.bat jar"/>
- </exec>
- <exec dir="build/download/xerces2-j" executable="/bin/sh"
osfamily="unix" failifexecutionfails="true" failonerror="true">
- <arg value="build.sh" />
- <arg value="jar" />
- </exec>
- <copy todir="lib"
file="build/download/xerces2-j/build/xercesImpl.jar"/>
+ <property name="xerces-version" value="2.10.0"/>
+ <property name="xerces-package" value="xerces"/>
+ <antcall target="download-via-maven"><param name="project-path"
value="${xerces-package}"/><param name="artifact-version"
value="${xerces-version}"/><param name="target" value="lib"/>
+ <param name="artifact-name" value="xercesImpl"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-xalan">
Modified:
manifoldcf/branches/CONNECTORS-633/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-633/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1444564&r1=1444563&r2=1444564&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-633/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-633/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
Sun Feb 10 16:58:53 2013
@@ -389,7 +389,7 @@ public class WikiConnector extends org.a
// sessionid="17ab96bd8ffbe8ca58a78657a918558e"
// />
//</api>
- XMLStream x = new XMLStream();
+ XMLStream x = new XMLStream(false);
WikiLoginAPIContext c = new WikiLoginAPIContext(x,result);
x.setContext(c);
try {
@@ -541,7 +541,7 @@ public class WikiConnector extends org.a
// sessionid="17ab96bd8ffbe8ca58a78657a918558e"
// />
//</api>
- XMLStream x = new XMLStream();
+ XMLStream x = new XMLStream(false);
WikiTokenLoginAPIContext c = new WikiTokenLoginAPIContext(x,result);
x.setContext(c);
try {
@@ -1890,7 +1890,7 @@ public class WikiConnector extends org.a
throws ManifoldCFException, ServiceInterruption
{
// Parse the document. This will cause various things to occur, within
the instantiated XMLContext class.
- XMLStream x = new XMLStream();
+ XMLStream x = new XMLStream(false);
WikiCheckAPIContext c = new WikiCheckAPIContext(x);
x.setContext(c);
try
@@ -2268,7 +2268,7 @@ public class WikiConnector extends org.a
throws ManifoldCFException, ServiceInterruption
{
// Parse the document. This will cause various things to occur, within
the instantiated XMLContext class.
- XMLStream x = new XMLStream();
+ XMLStream x = new XMLStream(false);
WikiListPagesAPIContext c = new
WikiListPagesAPIContext(x,buffer,startPageTitle);
x.setContext(c);
try
@@ -2635,7 +2635,7 @@ public class WikiConnector extends org.a
throws ManifoldCFException, ServiceInterruption
{
// Parse the document. This will cause various things to occur, within
the instantiated XMLContext class.
- XMLStream x = new XMLStream();
+ XMLStream x = new XMLStream(false);
WikiGetDocURLsAPIContext c = new WikiGetDocURLsAPIContext(x,urls);
x.setContext(c);
try
@@ -2957,7 +2957,7 @@ public class WikiConnector extends org.a
throws ManifoldCFException, ServiceInterruption
{
// Parse the document. This will cause various things to occur, within
the instantiated XMLContext class.
- XMLStream x = new XMLStream();
+ XMLStream x = new XMLStream(false);
WikiGetTimestampAPIContext c = new WikiGetTimestampAPIContext(x,versions);
x.setContext(c);
try
@@ -3290,7 +3290,7 @@ public class WikiConnector extends org.a
// </namespaces>
// </query>
//</api>
- XMLStream x = new XMLStream();
+ XMLStream x = new XMLStream(false);
WikiGetNamespacesAPIContext c = new
WikiGetNamespacesAPIContext(x,namespaces);
x.setContext(c);
try
@@ -3710,7 +3710,7 @@ public class WikiConnector extends org.a
// </query>
//</api>
- XMLStream x = new XMLStream();
+ XMLStream x = new XMLStream(false);
WikiGetDocInfoAPIContext c = new WikiGetDocInfoAPIContext(x);
x.setContext(c);
try
Modified: manifoldcf/branches/CONNECTORS-633/mvn-bootstrap.bat
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-633/mvn-bootstrap.bat?rev=1444564&r1=1444563&r2=1444564&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-633/mvn-bootstrap.bat (original)
+++ manifoldcf/branches/CONNECTORS-633/mvn-bootstrap.bat Sun Feb 10 16:58:53
2013
@@ -14,8 +14,6 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-cmd /c mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces
-DartifactId=xercesImpl -Dversion=2.9.1-mcf-1 -Dpackaging=jar
-
cmd /c mvn install:install-file -Dfile=lib/opensaml.jar -DgroupId=org.opensaml
-DartifactId=opensaml -Dversion=1.0.1 -Dpackaging=jar
cmd /c mvn install:install-file -Dfile=lib/xmlsec.jar -DgroupId=xml-security
-DartifactId=xmlsec -Dversion=1.4.1 -Dpackaging=jar
Modified: manifoldcf/branches/CONNECTORS-633/mvn-bootstrap.sh
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-633/mvn-bootstrap.sh?rev=1444564&r1=1444563&r2=1444564&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-633/mvn-bootstrap.sh (original)
+++ manifoldcf/branches/CONNECTORS-633/mvn-bootstrap.sh Sun Feb 10 16:58:53 2013
@@ -21,8 +21,6 @@
# Created: Wednesday, September 21 2011 by Alex Ott
#
-mvn install:install-file -Dfile=lib/xercesImpl.jar -DgroupId=xerces
-DartifactId=xercesImpl -Dversion=2.9.1-mcf-1 -Dpackaging=jar
-
mvn install:install-file -Dfile=lib/opensaml.jar -DgroupId=org.opensaml
-DartifactId=opensaml -Dversion=1.0.1 -Dpackaging=jar
mvn install:install-file -Dfile=lib/xmlsec.jar -DgroupId=xml-security
-DartifactId=xmlsec -Dversion=1.4.1 -Dpackaging=jar
Modified: manifoldcf/branches/CONNECTORS-633/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-633/pom.xml?rev=1444564&r1=1444563&r2=1444564&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-633/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-633/pom.xml Sun Feb 10 16:58:53 2013
@@ -53,7 +53,7 @@
<commons-el.version>1.0</commons-el.version>
<commons-lang.version>2.6</commons-lang.version>
<xalan.version>2.7.1</xalan.version>
- <xerces.version>2.9.1-mcf-1</xerces.version>
+ <xerces.version>2.10.0</xerces.version>
<jtds.version>1.2.4</jtds.version>
<servlet-api.version>2.5</servlet-api.version>
<jstl.version>1.2</jstl.version>
