manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1818437 - in /manifoldcf/branches/release-2.9-branch: ./ CHANGES.txt framework/build.xml
Date Sat, 16 Dec 2017 17:17:41 GMT
Author: kwright
Date: Sat Dec 16 17:17:41 2017
New Revision: 1818437

URL: http://svn.apache.org/viewvc?rev=1818437&view=rev
Log:
Pull up fix for CONNECTORS-1474 from trunk.

Modified:
    manifoldcf/branches/release-2.9-branch/   (props changed)
    manifoldcf/branches/release-2.9-branch/CHANGES.txt
    manifoldcf/branches/release-2.9-branch/framework/build.xml

Propchange: manifoldcf/branches/release-2.9-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 16 17:17:41 2017
@@ -150,4 +150,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1818149,1818225
+/manifoldcf/trunk:1818149,1818225,1818435

Modified: manifoldcf/branches/release-2.9-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.9-branch/CHANGES.txt?rev=1818437&r1=1818436&r2=1818437&view=diff
==============================================================================
--- manifoldcf/branches/release-2.9-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.9-branch/CHANGES.txt Sat Dec 16 17:17:41 2017
@@ -3,6 +3,9 @@ $Id$
 
 ======================= Release 2.9 =====================
 
+CONNECTORS-1474: Proprietary example missing CSS style files.
+(Markus Schuch, Karl Wright)
+
 CONNECTORS-1473: Alfresco authority did not return user token, just
 groups.
 (Phillip Rhodes, Karl Wright)

Modified: manifoldcf/branches/release-2.9-branch/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.9-branch/framework/build.xml?rev=1818437&r1=1818436&r2=1818437&view=diff
==============================================================================
--- manifoldcf/branches/release-2.9-branch/framework/build.xml (original)
+++ manifoldcf/branches/release-2.9-branch/framework/build.xml Sat Dec 16 17:17:41 2017
@@ -785,8 +785,12 @@
                 <include name="*.tld"/>
             </fileset>
         </copy>
-        <copy todir="build/webapp/crawler-ui-proprietary">            
-            <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
+        <copy todir="build/webapp/crawler-ui-proprietary">
+            <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.map,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
+        </copy>
+        <mkdir dir="build/webapp/crawler-ui-proprietary/css"/>
+        <copy todir="build/webapp/crawler-ui-proprietary/css">
+            <fileset dir="build/crawler-ui/css" includes="**/*.css,**/*.map"/>
         </copy>
         <jar destfile="build/webapp/crawler-ui-proprietary/WEB-INF/lib/mcf-crawler-ui.jar"
basedir="build/crawler-ui/classes"/>
     </target>



Mime
View raw message