Author: kishore
Date: Sun Jul 15 13:35:17 2018
New Revision: 1835974
URL: http://svn.apache.org/viewvc?rev=1835974&view=rev
Log:
Fix for CONNECTORS-1514
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/build.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1835974&r1=1835973&r2=1835974&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sun Jul 15 13:35:17 2018
@@ -3,6 +3,9 @@ $Id$
======================= 2.11-dev =====================
+CONNECTORS-1514: Fix MCF Combined Service UI
+(Kishore Kumar)
+
CONNECTORS-1513: Fix SeleniumTester clickTab method
(Karl Wright, Kishore Kumar)
Modified: manifoldcf/trunk/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1835974&r1=1835973&r2=1835974&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Sun Jul 15 13:35:17 2018
@@ -850,7 +850,11 @@
</fileset>
</copy>
<copy todir="build/webapp/combined-service">
- <fileset dir="crawler-ui/src/main/webapp"
includes="**/*.jsp,**/*.css,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
+ <fileset dir="crawler-ui/src/main/webapp"
includes="**/*.jsp,**/*.css,**/*.map,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
+ </copy>
+ <mkdir dir="build/webapp/combined-service/css"/>
+ <copy todir="build/webapp/combined-service/css">
+ <fileset dir="build/crawler-ui/css" includes="**/*.css,**/*.map"/>
</copy>
<jar
destfile="build/webapp/combined-service/WEB-INF/lib/mcf-combined-service.jar"
basedir="build/combined-service/classes"/>
</target>
@@ -915,7 +919,11 @@
</fileset>
</copy>
<copy todir="build/webapp/combined-service-proprietary">
- <fileset dir="crawler-ui/src/main/webapp"
includes="**/*.jsp,**/*.css,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
+ <fileset dir="crawler-ui/src/main/webapp"
includes="**/*.jsp,**/*.css,**/*.map,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
+ </copy>
+ <mkdir dir="build/webapp/combined-service/css"/>
+ <copy todir="build/webapp/combined-service/css">
+ <fileset dir="build/crawler-ui/css" includes="**/*.css,**/*.map"/>
</copy>
<jar
destfile="build/webapp/combined-service-proprietary/WEB-INF/lib/mcf-combined-service.jar"
basedir="build/combined-service/classes"/>
</target>
