Author: kwright
Date: Mon Apr 7 17:00:10 2014
New Revision: 1585519
URL: http://svn.apache.org/r1585519
Log:
Fix CONNECTORS-919
Added:
manifoldcf/trunk/connectors/memex/proprietary-library-instructions.txt
(with props)
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/memex/build.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1585519&r1=1585518&r2=1585519&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Apr 7 17:00:10 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.6-dev =====================
+CONNECTORS-919: Fix example-proprietary.
+(Karl Wright)
+
CONNECTORS-913: Only remove connector registration when connectors
are being delivered.
(Karl Wright)
Modified: manifoldcf/trunk/connectors/memex/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/memex/build.xml?rev=1585519&r1=1585518&r2=1585519&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/memex/build.xml (original)
+++ manifoldcf/trunk/connectors/memex/build.xml Mon Apr 7 17:00:10 2014
@@ -43,16 +43,36 @@
<path id="connector-classpath">
<path refid="mcf-connector-build.connector-classpath"/>
- <fileset dir="mxie-java" includes="*.jar"/>
+ <fileset dir="lib-proprietary" includes="*.jar"/>
</path>
- <target name="lib" depends="mcf-connector-build.lib,precompile-check"
if="canBuild">
- <mkdir dir="dist/lib"/>
- <copy todir="dist/lib">
- <fileset dir="mxie-java" includes="*.jar"/>
+ <target name="has-proprietary-materials-check">
+ <available file="lib-proprietary/mxie.jar" property="mxieStatus"/>
+ <condition property="proprietaryMaterialsAvailable">
+ <isset property="mxieStatus"/>
+ </condition>
+ </target>
+
+ <target name="calculate-run-condition"
depends="has-proprietary-materials-check">
+ <condition property="libs-present">
+ <isset property="proprietaryMaterialsAvailable"/>
+ </condition>
+ </target>
+
+ <target name="prerun-warn" depends="calculate-run-condition"
unless="libs-present">
+ <echo message="Memex connector requires mxie.jar to be runnable"/>
+ </target>
+
+ <target name="copy-proprietary-libs" depends="prerun-check" if="canRun">
+ <mkdir dir="dist/lib-proprietary-only"/>
+ <copy todir="dist/lib-proprietary-only">
+ <fileset dir="lib-proprietary" includes="*.jar"/>
</copy>
</target>
+ <target name="lib"
depends="mcf-connector-build.lib,copy-proprietary-libs,precompile-check"
if="canBuild">
+ </target>
+
<target name="deliver-connector"
depends="mcf-connector-build.deliver-connector">
<antcall target="general-add-authority-connector">
<param name="connector-label" value="Memex Patriarch"/>
Added: manifoldcf/trunk/connectors/memex/proprietary-library-instructions.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/memex/proprietary-library-instructions.txt?rev=1585519&view=auto
==============================================================================
--- manifoldcf/trunk/connectors/memex/proprietary-library-instructions.txt
(added)
+++ manifoldcf/trunk/connectors/memex/proprietary-library-instructions.txt Mon
Apr 7 17:00:10 2014
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+The Memex connector has been discontinued, until such time as
+Memex gives permission to include it.
+
Propchange:
manifoldcf/trunk/connectors/memex/proprietary-library-instructions.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
manifoldcf/trunk/connectors/memex/proprietary-library-instructions.txt
------------------------------------------------------------------------------
svn:keywords = Id
