upd to Jetty v9.2.16.v20160414

- exclude unused mime4j
- remove unused yacy-cora build
pull/51/head
reger 9 years ago
parent 24b0fa2a38
commit b74cddc49c

@ -20,7 +20,6 @@
<classpathentry kind="lib" path="lib/commons-jxpath-1.3.jar"/>
<classpathentry kind="lib" path="lib/jsch-0.1.53.jar"/>
<classpathentry kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
<classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar"/>
<classpathentry kind="lib" path="lib/commons-fileupload-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/json-simple-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl.jar"/>
@ -50,20 +49,20 @@
<classpathentry kind="lib" path="lib/commons-io-2.5.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.18.jar"/>
<classpathentry kind="lib" path="lib/chardet.jar"/>
<classpathentry kind="lib" path="lib/jetty-client-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-continuation-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-deploy-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-http-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-io-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-jmx-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-proxy-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-security-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-server-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlet-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlets-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-webapp-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-xml-9.2.15.v20160210.jar"/>
<classpathentry kind="lib" path="lib/jetty-client-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-continuation-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-deploy-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-http-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-io-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-jmx-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-proxy-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-security-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-server-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlet-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlets-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-webapp-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/jetty-xml-9.2.16.v20160414.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.5.2.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.2.jar"/>
<classpathentry kind="lib" path="lib/noggit-0.6.jar"/>

1
.gitignore vendored

@ -9,7 +9,6 @@ classes/
RELEASE/
/yacy.pid
.DS_Store
lib/yacy-cora.jar
/DATA.bkp
/DATA.1
/gen

@ -160,7 +160,6 @@
<!-- when changing paths here, please also update the paths in /addon/YaCy.app/Contents/Info.plist -->
<path id="project.class.path">
<pathelement location="${build}" />
<pathelement location="${lib}/apache-mime4j-0.6.jar" />
<pathelement location="${lib}/bcmail-jdk15-1.46.jar" />
<pathelement location="${lib}/bcprov-jdk15-1.46.jar" />
<pathelement location="${lib}/chardet.jar" />
@ -192,20 +191,20 @@
<pathelement location="${lib}/jcifs-1.3.17.jar" />
<pathelement location="${lib}/jcl-over-slf4j-1.7.18.jar" />
<pathelement location="${lib}/jempbox-1.8.11.jar" />
<pathelement location="${lib}/jetty-client-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-continuation-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-deploy-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-http-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-io-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-jmx-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-proxy-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-security-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-server-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-servlet-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-servlets-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-util-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-webapp-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-xml-9.2.15.v20160210.jar" />
<pathelement location="${lib}/jetty-client-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-continuation-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-deploy-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-http-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-io-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-jmx-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-proxy-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-security-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-server-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-servlet-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-servlets-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-util-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-webapp-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jetty-xml-9.2.16.v20160414.jar" />
<pathelement location="${lib}/jsch-0.1.53.jar" />
<pathelement location="${lib}/json-simple-1.1.1.jar" />
<pathelement location="${lib}/jsoup-1.9.1.jar" />
@ -292,21 +291,6 @@
</target>
<target name="compile-cora" depends="init" description="compile YaCy cora component">
<!-- compile the cora sources -->
<javac srcdir="${src}/net/yacy/cora/" destdir="${build}/"
debug="true" debuglevel="lines,vars,source"
source="${javacSource}" target="${javacTarget}" encoding="UTF-8">
<classpath refid="project.class.path" />
<compilerarg value="-Xlint"/>
</javac>
<!-- make yacy-cora.jar -->
<jar destfile="${lib}/yacy-cora.jar" includes="**/net/yacy/cora/**" basedir="${build}/"></jar>
</target>
<target name="compile" depends="compile-core" description="compile YaCy core and YaCy servlets">
<!-- compile htroot, htroot/yacy and htroot/htdocsdefault -->
<javac srcdir="${htroot}/"
@ -528,7 +512,6 @@
<delete file="${build}/net/yacy/peers/operation/yacyBuildProperties.java" failonerror="false"/>
<delete file="${build}/log4j.properties" failonerror="false"/>
<delete file="${lib}/yacycore.jar" failonerror="false"/>
<delete file="${lib}/yacy-cora.jar" failonerror="false"/>
<delete file="${lib}/svnRevNr.jar" failonerror="false"/>
<delete file="${libbuild}/svnRevNr.jar" failonerror="false"/>
<delete file="${libbuild}/GitRevTask.jar" failonerror="false"/>

@ -36,7 +36,7 @@
<!-- the Solr version used in dependency section for all related dependencies -->
<solr.version>5.5.0</solr.version>
<!-- the Jetty version used in dependency section for all related dependencies -->
<jetty.version>9.2.15.v20160210</jetty.version>
<jetty.version>9.2.16.v20160414</jetty.version>
<!-- properties used for filtering yacyBuildProperties.java -->
<REPL_DATE>${DSTAMP}</REPL_DATE>
@ -67,7 +67,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.5.1</version>
<configuration>
<excludes>
<!-- special exclude for compatibility with ant build script
@ -160,9 +160,9 @@
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
<windowtitle>YaCy API: javadoc documentation</windowtitle>
<excludes>
htroot/*.java
</excludes>
<includes>
${project.build.directory}/*.java
</includes>
<failOnError>false</failOnError>
</configuration>
</plugin>
@ -309,11 +309,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
<version>0.6.1</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>

@ -7,10 +7,18 @@ import java.util.List;
import net.yacy.utils.translation.ExtensionsFileFilter;
import org.junit.Test;
import static org.junit.Assert.*;
import org.junit.BeforeClass;
public class Html2ImageTest {
@BeforeClass
public static void setUpClass() throws Exception {
// make sure DATA exists
File f = new File("test/DATA");
if (!f.exists()) f.mkdir();
}
/**
* Test of pdf2image method, of class Html2Image.
*/
@ -22,6 +30,7 @@ public class Html2ImageTest {
extensions.add("pdf");
FilenameFilter fileFilter = new ExtensionsFileFilter(extensions);
String[] pdffiles = pd.list(fileFilter);
assertTrue("no pdf files in test/parsertest directory", pdffiles.length > 0);
for (String pdffilename : pdffiles) {
File pdffile = new File(pd, pdffilename);

Loading…
Cancel
Save