Author: kwright
Date: Sat Apr 29 00:29:31 2017
New Revision: 1793157
URL: http://svn.apache.org/viewvc?rev=1793157&view=rev
Log:
Fix for CONNECTORS-1418.
Added:
manifoldcf/trunk/framework/crawler-ui/src/main/less/
- copied from r1793156,
manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/src/main/less/
manifoldcf/trunk/framework/less-compiler/
- copied from r1793156,
manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/
Removed:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/css/style.css
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/less/
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/framework/.gitignore
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/framework/crawler-ui/pom.xml
manifoldcf/trunk/framework/pom.xml
manifoldcf/trunk/lib-license/LICENSE.txt
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 29 00:29:31 2017
@@ -74,6 +74,7 @@
/manifoldcf/branches/CONNECTORS-1313:1742768-1743158
/manifoldcf/branches/CONNECTORS-1344:1770553-1771642
/manifoldcf/branches/CONNECTORS-1399:1788351-1788417
+/manifoldcf/branches/CONNECTORS-1418:1792801-1793156
/manifoldcf/branches/CONNECTORS-470:1349741-1360750,1360808
/manifoldcf/branches/CONNECTORS-474:1349741-1353803
/manifoldcf/branches/CONNECTORS-488:1363249-1364203
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1793157&r1=1793156&r2=1793157&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Apr 29 00:29:31 2017
@@ -3,6 +3,9 @@ $Id$
======================= 2.8-dev =====================
+CONNECTORS-1418: Build .less files into style.css as part of the build.
+(Kishore Kumar, Karl Wright)
+
CONNECTORS-1420: Fix the email connector's date range code.
(Cihad Guzel)
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1793157&r1=1793156&r2=1793157&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sat Apr 29 00:29:31 2017
@@ -839,6 +839,31 @@ Use Apache Forrest version forrest-0.9-d
</java>
</target>
+ <target name="download-less-compiler" depends="download-protobuf">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="com/github/sommeri"/>
+ <param name="artifact-version" value="1.17.2"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="less4j"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="org/antlr"/>
+ <param name="artifact-version" value="3.5.2"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="antlr-runtime"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="commons-beanutils"/>
+ <param name="artifact-version" value="1.8.3"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="commons-beanutils"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="setup-nuxeo-url">
<property name="nuxeo-base-url"
value="http://maven.nuxeo.com/nexus/content/repositories/public-releases"/>
</target>
@@ -2667,7 +2692,7 @@ Use Apache Forrest version forrest-0.9-d
</antcall>
</target>
- <target name="make-core-deps"
depends="download-forbidden-checks,download-nuxeo-client,download-json-simple,download-selenium,download-kafka-client,download-joda-time,download-aws-sdk,download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download
-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps"
depends="download-less-compiler,download-forbidden-checks,download-nuxeo-client,download-json-simple,download-selenium,download-kafka-client,download-joda-time,download-aws-sdk,download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,downl
oad-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
Modified: manifoldcf/trunk/framework/.gitignore
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/.gitignore?rev=1793157&r1=1793156&r2=1793157&view=diff
==============================================================================
--- manifoldcf/trunk/framework/.gitignore (original)
+++ manifoldcf/trunk/framework/.gitignore Sat Apr 29 00:29:31 2017
@@ -2,4 +2,5 @@
/.project
/dist/
/build/
+/target/
*/target/
Modified: manifoldcf/trunk/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1793157&r1=1793156&r2=1793157&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Sat Apr 29 00:29:31 2017
@@ -28,6 +28,17 @@
<delete dir="test-HSQLDB-output"/>
<delete dir="test-HSQLDBext-output"/>
</target>
+
+ <path id="less-classpath">
+ <fileset dir="../lib">
+ <include name="less4j*.jar"/>
+ <include name="antlr-runtime*.jar"/>
+ <include name="commons-beanutils*.jar"/>
+ <include name="protobuf-java*.jar"/>
+ <include name="commons-io*.jar"/>
+ <include name="commons-logging*.jar"/>
+ </fileset>
+ </path>
<path id="framework-classpath">
<fileset dir="../lib">
@@ -198,7 +209,16 @@
<fileset dir="jetty-runner/src/main/java" includes="**/*.java"/>
</javadoc>
</target>
-
+
+ <target name="compile-less-compiler">
+ <mkdir dir="build/less-compiler/classes"/>
+ <javac srcdir="less-compiler/src/main/java"
destdir="build/less-compiler/classes" deprecation="true" target="1.8"
source="1.8" debug="true" encoding="utf-8" debuglevel="lines,vars,source">
+ <classpath>
+ <path refid="less-classpath"/>
+ </classpath>
+ </javac>
+ </target>
+
<target name="compile-core">
<mkdir dir="build/core/classes"/>
<javac srcdir="core/src/main/java" destdir="build/core/classes"
deprecation="true" target="1.8" source="1.8" debug="true" encoding="utf-8"
debuglevel="lines,vars,source">
@@ -345,7 +365,21 @@
</javac>
</target>
- <target name="compile-crawler-ui"
depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent">
+ <target name="less-compiler-invocation" depends="compile-less-compiler">
+ <mkdir dir="build/crawler-ui/css"/>
+ <java classname="org.apache.manifoldcf.less.MCFLessCompiler"
fork="true" failonerror="true" maxmemory="128m">
+ <arg value="crawler-ui/src/main/less/style.less"/>
+ <arg value="build/crawler-ui/css/style.css"/>
+ <!-- Compress less output -->
+ <arg value="true"/>
+ <classpath>
+ <path refid="less-classpath"/>
+ <pathelement location="build/less-compiler/classes"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="compile-crawler-ui"
depends="less-compiler-invocation,compile-core,compile-ui-core,compile-agents,compile-pull-agent">
<mkdir dir="build/crawler-ui/classes"/>
<javac srcdir="crawler-ui/src/main/java"
destdir="build/crawler-ui/classes" deprecation="true" target="1.8" source="1.8"
debug="true" encoding="utf-8" debuglevel="lines,vars,source">
<classpath>
@@ -671,7 +705,11 @@
</fileset>
</copy>
<copy todir="build/webapp/crawler-ui">
- <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/crawler-ui/css"/>
+ <copy todir="build/webapp/crawler-ui/css">
+ <fileset dir="build/crawler-ui/css" includes="**/*.css,**/*.map"/>
</copy>
<jar destfile="build/webapp/crawler-ui/WEB-INF/lib/mcf-crawler-ui.jar"
basedir="build/crawler-ui/classes"/>
</target>
Modified: manifoldcf/trunk/framework/crawler-ui/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/pom.xml?rev=1793157&r1=1793156&r2=1793157&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/pom.xml (original)
+++ manifoldcf/trunk/framework/crawler-ui/pom.xml Sat Apr 29 00:29:31 2017
@@ -28,10 +28,43 @@
<name>ManifoldCF - Framework - Crawler UI</name>
<packaging>war</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+
+ <configuration>
+ <mainClass>org.apache.manifoldcf.less.MCFLessCompiler</mainClass>
+ <arguments>
+ <argument>${project.basedir}/src/main/less/style.less</argument>
+
<argument>${project.build.directory}/${project.build.finalName}/css/style.css</argument>
+ <argument>true</argument>
+ </arguments>
+ </configuration>
+ <executions>
+ <execution>
+ <id>compile-less</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<!-- Internal dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>mcf-less-compiler</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>mcf-core</artifactId>
<version>${project.version}</version>
</dependency>
Modified: manifoldcf/trunk/framework/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pom.xml?rev=1793157&r1=1793156&r2=1793157&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pom.xml (original)
+++ manifoldcf/trunk/framework/pom.xml Sat Apr 29 00:29:31 2017
@@ -32,6 +32,7 @@
<packaging>pom</packaging>
<modules>
+ <module>less-compiler</module>
<module>core</module>
<module>connector-common</module>
<module>ui-core</module>
Modified: manifoldcf/trunk/lib-license/LICENSE.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1793157&r1=1793156&r2=1793157&view=diff
==============================================================================
--- manifoldcf/trunk/lib-license/LICENSE.txt (original)
+++ manifoldcf/trunk/lib-license/LICENSE.txt Sat Apr 29 00:29:31 2017
@@ -514,6 +514,9 @@ License: Apache License, Version 2.0 (ht
This product includes a okio.jar.
License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+This product includes a less4j.jar.
+License: Triple license, distributed under Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
==========================================================================
The following license applies to postgresql.jar, which is available from
http://jdbc.postgresql.org
