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/02/09 12:14:42 UTC

svn commit: r1242281 - in /incubator/lcf/branches/CONNECTORS-402: build.xml framework/build.xml framework/example-common/README.txt

Author: kwright
Date: Thu Feb  9 11:14:41 2012
New Revision: 1242281

URL: http://svn.apache.org/viewvc?rev=1242281&view=rev
Log:
Put a README into connector-lib-proprietary to make sure it is created in a zip and also tell people what it is for.

Added:
    incubator/lcf/branches/CONNECTORS-402/framework/example-common/README.txt   (with props)
Modified:
    incubator/lcf/branches/CONNECTORS-402/build.xml
    incubator/lcf/branches/CONNECTORS-402/framework/build.xml

Modified: incubator/lcf/branches/CONNECTORS-402/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/build.xml?rev=1242281&r1=1242280&r2=1242281&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/build.xml Thu Feb  9 11:14:41 2012
@@ -950,6 +950,14 @@
                 <include name="connectors-proprietary.xml"/>
             </fileset>
         </copy>
+        <mkdir dir="dist/connector-lib"/>
+        <copy todir="dist/connector-lib">
+            <fileset dir="framework/dist/connector-lib"/>
+        </copy>
+        <mkdir dir="dist/connector-lib-proprietary"/>
+        <copy todir="dist/connector-lib-proprietary">
+            <fileset dir="framework/dist/connector-lib-proprietary"/>
+        </copy>
     </target>
     
     <target name="deliver-framework-doc" depends="doc-framework">
@@ -2186,7 +2194,7 @@
           <exclude name="**/test-materials-proprietary/*.xsd"/>
           <exclude name="/legacy-*/"/>
           <exclude name="**/*.pdf"/>
-          <exclude name="dist/connector-lib-proprietary/*"/>
+          <exclude name="dist/connector-lib-proprietary/*.jar"/>
           <exclude name="dist/connectors-proprietary.xml"/>
           <exclude name="dist/example-proprietary/"/>
           <exclude name="dist/multiprocess-example-proprietary/"/>
@@ -2221,7 +2229,7 @@
           <exclude name="**/test-materials-proprietary/*.xsd"/>
           <exclude name="/legacy-*/"/>
           <exclude name="**/*.pdf"/>
-          <exclude name="dist/connector-lib-proprietary/*"/>
+          <exclude name="dist/connector-lib-proprietary/*.jar"/>
           <exclude name="dist/connectors-proprietary.xml"/>
           <exclude name="dist/example-proprietary/"/>
           <exclude name="dist/multiprocess-example-proprietary/"/>

Modified: incubator/lcf/branches/CONNECTORS-402/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/framework/build.xml?rev=1242281&r1=1242280&r2=1242281&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/framework/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-402/framework/build.xml Thu Feb  9 11:14:41 2012
@@ -533,6 +533,9 @@
     <target name="example-common">
         <copy file="example-common/connectors.xml" tofile="dist/connectors.xml"/>
         <copy file="example-common/connectors.xml" tofile="dist/connectors-proprietary.xml"/>
+        <mkdir dir="dist/connector-lib"/>
+        <mkdir dir="dist/connector-lib-proprietary"/>
+        <copy file="example-common/README.txt" todir="dist/connector-lib-proprietary"/>
     </target>
     
     <target name="war-authority-service" depends="webapp-authority-service">

Added: incubator/lcf/branches/CONNECTORS-402/framework/example-common/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-402/framework/example-common/README.txt?rev=1242281&view=auto
==============================================================================
--- incubator/lcf/branches/CONNECTORS-402/framework/example-common/README.txt (added)
+++ incubator/lcf/branches/CONNECTORS-402/framework/example-common/README.txt Thu Feb  9 11:14:41 2012
@@ -0,0 +1,25 @@
+# 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.
+
+This directory is meant to contain proprietary jars required for the execution
+of connectors, which cannot be redistributed under the Apache license.
+
+If you receive the binary distribution of ManifoldCF, and you want to enable
+one of the proprietary connectors, you must place the required proprietary
+material in this directory, and then enable the connector by uncommenting
+the appropriate entries in the connectors.xml file.  Further information can be
+found on the "how-to-build-and-deploy.html" documentation page.
+
+

Propchange: incubator/lcf/branches/CONNECTORS-402/framework/example-common/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/branches/CONNECTORS-402/framework/example-common/README.txt
------------------------------------------------------------------------------
    svn:keywords = Id