manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1792979 - in /manifoldcf/branches/CONNECTORS-1418/framework: ./ crawler-ui/ crawler-ui/src/main/java/org/apache/manifoldcf/less/ less-compiler/ less-compiler/src/ less-compiler/src/main/ less-compiler/src/main/java/ less-compiler/src/main/...
Date Fri, 28 Apr 2017 04:20:03 GMT
Author: kwright
Date: Fri Apr 28 04:20:03 2017
New Revision: 1792979

URL: http://svn.apache.org/viewvc?rev=1792979&view=rev
Log:
Create a new jar to contain the less compiler.

Added:
    manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/
    manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/pom.xml
      - copied, changed from r1792976, manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/pom.xml
    manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/src/
    manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/src/main/
    manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/src/main/java/
    manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/src/main/java/org/
    manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/src/main/java/org/apache/
    manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/src/main/java/org/apache/manifoldcf/
    manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/src/main/java/org/apache/manifoldcf/less/
    manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/src/main/java/org/apache/manifoldcf/less/MCFLessCompiler.java
      - copied unchanged from r1792976, manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/src/main/java/org/apache/manifoldcf/less/MCFLessCompiler.java
Removed:
    manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/src/main/java/org/apache/manifoldcf/less/
Modified:
    manifoldcf/branches/CONNECTORS-1418/framework/build.xml
    manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/pom.xml
    manifoldcf/branches/CONNECTORS-1418/framework/pom.xml

Modified: manifoldcf/branches/CONNECTORS-1418/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1418/framework/build.xml?rev=1792979&r1=1792978&r2=1792979&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1418/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1418/framework/build.xml Fri Apr 28 04:20:03 2017
@@ -32,6 +32,7 @@
     <path id="less-classpath">
         <fileset dir="../lib">
             <include name="less4j*.jar"/>
+            <include name="commons-io*.jar"/>
         </fileset>
     </path>
     
@@ -204,7 +205,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">
@@ -351,12 +361,13 @@
         </javac>
     </target>
 
-    <target name="compile-crawler-ui" depends="compile-core,compile-ui-core,compile-agents,compile-pull-agent">
+    <target name="compile-crawler-ui" depends="compile-less-compiler,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>
-                <path refid="framework-classpath"/>
                 <path refid="less-classpath"/>
+                <pathelement location="build/less-compiler/classes"/>
+                <path refid="framework-classpath"/>
                 <pathelement location="build/core/classes"/>
                 <pathelement location="build/ui-core/classes"/>
                 <pathelement location="build/agents/classes"/>

Modified: manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/pom.xml?rev=1792979&r1=1792978&r2=1792979&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/pom.xml Fri Apr 28 04:20:03 2017
@@ -63,6 +63,11 @@
     <!-- 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>
@@ -156,13 +161,6 @@
       <scope>runtime</scope>
     </dependency>
 
-    <!-- Less compiler -->
-    <dependency>
-      <groupId>com.github.sommeri</groupId>
-      <artifactId>less4j</artifactId>
-      <version>1.17.2</version>
-    </dependency>
-
   </dependencies>
 
 </project>

Copied: manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/pom.xml (from r1792976,
manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/pom.xml)
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/pom.xml?p2=manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/pom.xml&p1=manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/pom.xml&r1=1792976&r2=1792979&rev=1792979&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1418/framework/crawler-ui/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1418/framework/less-compiler/pom.xml Fri Apr 28 04:20:03
2017
@@ -24,137 +24,11 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>mcf-crawler-ui</artifactId>
-  <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/webapp/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>
-              <!-- Currently during process-classes phase, css is generated, but during
the package phase,
-              the generated css will be over written by the file from source css folder.
It's intentional for now,
-              but once the decision is made about approach, we can change the phase to prepare-package
-->
-              <phase>process-classes</phase>
-              <goals>
-                  <goal>java</goal>
-              </goals>
-            </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+  <artifactId>mcf-less-compiler</artifactId>
+  <name>ManifoldCF - Framework - Less Compiler</name>
+  <packaging>jar</packaging>
 
   <dependencies>
-    <!-- Internal dependencies -->
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mcf-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mcf-agents</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mcf-pull-agent</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mcf-ui-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- web dependencies -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>${servlet-api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- runtime dependencies -->
-    <dependency>
-      <groupId>jstl</groupId>
-      <artifactId>jstl</artifactId>
-      <version>${jstl.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>serializer</artifactId>
-      <version>${xalan.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>${xerces.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>${xml-apis.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <!-- database dependencies -->
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>${hsqldb.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>${postgresql.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>${mysql.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mariadb.jdbc</groupId>
-      <artifactId>mariadb-java-client</artifactId>
-      <version>${mariadb.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <!-- JDBC connector dependencies -->
-    <dependency>
-      <groupId>net.sourceforge.jtds</groupId>
-      <artifactId>jtds</artifactId>
-      <version>${jtds.version}</version>
-      <scope>runtime</scope>
-    </dependency>
 
     <!-- Less compiler -->
     <dependency>

Modified: manifoldcf/branches/CONNECTORS-1418/framework/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1418/framework/pom.xml?rev=1792979&r1=1792978&r2=1792979&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1418/framework/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1418/framework/pom.xml Fri Apr 28 04:20:03 2017
@@ -32,6 +32,7 @@
   <packaging>pom</packaging>
 
   <modules>
+    <module>less-compiler</module>
     <module>core</module>
     <module>connector-common</module>
     <module>ui-core</module>



Mime
View raw message