Mercurial > hg > digilib

changeset 1673:8769e44c30b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
start using travis-ci. clean some unused files. https://travis-ci.org/robcast/digilib
author Robert Casties <r0bcas7@gmail.com>
date Tue, 05 Dec 2017 18:44:33 +0100
parents 7f06a88745c4
children 699244b75ad3
files .travis.yml servlet3/pom.xml.orig text/pom.xml.orig webapp/pom.xml.orig webapp/src/main/webapp/jquery/digilib-auth.html.orig webapp/src/main/webapp/jquery/digilib.html.orig
diffstat 6 files changed, 1 insertions(+), 415 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.travis.yml	Tue Dec 05 18:44:33 2017 +0100
@@ -0,0 +1,1 @@
+language: java
--- a/servlet3/pom.xml.orig	Thu Nov 23 20:04:44 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>digilib</artifactId>
-    <groupId>digilib</groupId>
-    <version>2.3.1</version>
-  </parent>
-  <artifactId>digilib-servlet3</artifactId>
-  <name>digilib-servlet3</name>
-  <build>
-  	<pluginManagement>
-  		<plugins>
-  			<plugin>
-  				<groupId>org.apache.maven.plugins</groupId>
-  				<artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target> 
-                </configuration>
-  			</plugin>
-  		</plugins>
-  	</pluginManagement>
-  </build>
-  <dependencies>
-  	<dependency>
-  		<groupId>org.mortbay.jetty</groupId>
-  		<artifactId>servlet-api</artifactId>
-  		<version>3.0.20100224</version>
-  		<type>jar</type>
-  		<scope>provided</scope>
-  	</dependency>
-  	<dependency>
-  		<groupId>digilib</groupId>
-  		<artifactId>digilib-servlet</artifactId>
-  	</dependency>
-  </dependencies>
-  <description>digilib servlet components using asynchronous servlet API.</description>
-</project>
\ No newline at end of file
--- a/text/pom.xml.orig	Thu Nov 23 20:04:44 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>digilib</artifactId>
-		<groupId>digilib</groupId>
-		<version>2.3.1</version>
-	</parent>
-	<artifactId>digilib-text</artifactId>
-	<name>digilib-text</name>
-	<dependencies>
-		<dependency>
-			<groupId>digilib</groupId>
-			<artifactId>digilib-common</artifactId>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	<description>The Digital Image Library - text (plain or XML) serving servlet</description>
-	<url>http://digilib.sourceforge.net</url>
-	<profiles>
-		<profile>
-			<id>servlet2</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-				<property>
-					<name>servletapi</name>
-					<value>2</value>
-				</property>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>digilib</groupId>
-					<artifactId>digilib-servlet2</artifactId>
-					<type>jar</type>
-					<scope>provided</scope>
-				</dependency>
-				<dependency>
-					<groupId>javax.servlet</groupId>
-					<artifactId>servlet-api</artifactId>
-					<version>2.3</version>
-					<type>jar</type>
-					<scope>provided</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>servlet3</id>
-			<activation>
-				<property>
-					<name>servletapi</name>
-					<value>3</value>
-				</property>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>digilib</groupId>
-					<artifactId>digilib-servlet3</artifactId>
-					<type>jar</type>
-					<scope>provided</scope>
-				</dependency>
-				<dependency>
-					<groupId>org.mortbay.jetty</groupId>
-					<artifactId>servlet-api</artifactId>
-					<version>3.0.20100224</version>
-					<type>jar</type>
-					<scope>provided</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
-</project>
\ No newline at end of file
--- a/webapp/pom.xml.orig	Thu Nov 23 20:04:44 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>digilib</artifactId>
-		<groupId>digilib</groupId>
-		<version>2.3.7</version>
-	</parent>
-	<artifactId>digilib-webapp</artifactId>
-	<name>digilib-webapp</name>
-	<description>The Digital Image Library - web application server and HTML and JS clients.</description>
-	<url>http://digilib.sourceforge.net</url>
-	<packaging>war</packaging>
-	
-	<properties>
-        <skipTests>true</skipTests>
-    </properties>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-war-plugin</artifactId>
-					<version>2.6</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>license-maven-plugin</artifactId>
-					<version>1.4</version>
-					<configuration>
-						<includes>
-							<include>**/*digilib*.js</include>
-							<include>**/*.jsp</include>
-						</includes>
-					</configuration>
-				</plugin>
-		        <plugin>
-			        <groupId>org.apache.maven.plugins</groupId>
-			        <artifactId>maven-surefire-plugin</artifactId>
-			        <version>2.19</version>
-			        <configuration>
-			            <skip>${skipTests}</skip>
-			        </configuration>
-			    </plugin>
-        	</plugins>
-		</pluginManagement>
-	</build>
-	<profiles>
-		<profile>
-			<id>servlet2</id>
-			<activation>
-				<property>
-					<name>servletapi</name>
-					<value>2</value>
-				</property>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>digilib</groupId>
-					<artifactId>digilib-servlet2</artifactId>
-					<type>jar</type>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-war-plugin</artifactId>
-						<configuration>
-							<webXml>${basedir}/src/main/webapp/WEB-INF/web-2.4.xml</webXml>
-							<classifier>srv2</classifier>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>servlet3</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-				<property>
-					<name>servletapi</name>
-					<value>3</value>
-				</property>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>digilib</groupId>
-					<artifactId>digilib-servlet3</artifactId>
-					<type>jar</type>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-war-plugin</artifactId>
-						<configuration>
-							<webXml>${basedir}/src/main/webapp/WEB-INF/web-3.0.xml</webXml>
-							<classifier>srv3</classifier>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-compiler-plugin</artifactId>
-						<configuration>
-							<source>1.7</source>
-							<target>1.7</target>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>pdf</id>
-			<dependencies>
-				<dependency>
-					<groupId>digilib</groupId>
-					<artifactId>digilib-pdf</artifactId>
-					<type>jar</type>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>text</id>
-			<dependencies>
-				<dependency>
-					<groupId>digilib</groupId>
-					<artifactId>digilib-text</artifactId>
-					<type>jar</type>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>codec-jai</id>
-			<dependencies>
-				<dependency>
-					<groupId>digilib</groupId>
-					<artifactId>digilib-common-jai</artifactId>
-					<type>jar</type>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>codec-imagej</id>
-			<dependencies>
-				<dependency>
-					<groupId>digilib</groupId>
-					<artifactId>digilib-common-imagej</artifactId>
-					<type>jar</type>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>codec-bioformats</id>
-			<dependencies>
-				<dependency>
-					<groupId>digilib</groupId>
-					<artifactId>digilib-common-bioformats</artifactId>
-					<type>jar</type>
-					<scope>compile</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-        <profile>
-            <id>cors-filter</id>
-            <!--  external servlet filter to add CORS headers. enable in web.xml -->
-            <dependencies>
-                <dependency>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-servlets</artifactId>
-                    <version>9.2.13.v20150730</version>
-                </dependency>
-            </dependencies>
-        </profile>
-	</profiles>
-	<dependencies>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-            <version>9.2.13.v20150730</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-http</artifactId>
-			<version>9.2.13.v20150730</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>
--- a/webapp/src/main/webapp/jquery/digilib-auth.html.orig	Thu Nov 23 20:04:44 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <meta name="viewport" content="initial-scale=1.0"/>
-        <title>Digilib jQuery: fullscreen</title>
-
-        <style type="text/css">
-            body {
-                 background: silver;
-            }
-        </style>
-
-        <script type="text/javascript" src="jquery.js"></script>
-        <script type="text/javascript" src="jquery.cookie.js"></script>
-
-        <!-- 
-        <script type="text/javascript" src="jquery.digilib-auth.min.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery.digilib-auth.min.css" />
-        -->
-        
-        <script type="text/javascript" src="jquery.digilib.js"></script>
-        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
-        <script type="text/javascript" src="jquery.digilib.arrows.js"></script>
-        <script type="text/javascript" src="jquery.range.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery.range.css" />
-        <script type="text/javascript" src="jquery.digilib.buttons.js"></script>
-        <script type="text/javascript" src="jquery.digilib.dialogs.js"></script>
-        <script type="text/javascript" src="jquery.digilib.sliders.js"></script>
-        <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
-        <script type="text/javascript" src="jquery.digilib.marks.js"></script>
-        <script type="text/javascript" src="jquery.digilib.regions.js"></script>
-        <script type="text/javascript" src="jquery.digilib.oauth.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
-        <link rel="stylesheet" type="text/css" href="jquery.digilib.buttons-full-32-sprite.css" />
-        
-
-        <script type="text/javascript">
-            $(document).ready(function(){
-                var opts = {
-                    //authServerUrl : 'http://localhost:18080/ldap-openid-connect-server/authorize',
-                    //authClientId : 'client',
-                    authServerUrl : 'https://id.mpiwg-berlin.mpg.de/openid/authorize',
-                    authClientId : 'digilib-rc-local',
-                    authOnErrorMode : true
-                };
-                var $div = $('div#digilib');
-                $div.digilib(opts);
-            });
-
-        </script>
-    </head>
-
-    <body>
-        <div id="digilib">
-            <p>digilib doesn't work! Please switch on Javascript or notify the server administrator!</p>
-            <img src="http://digilib.sourceforge.net/images/digilib-logo-big.png" />
-        </div>
-    </body>
-</html>
-
--- a/webapp/src/main/webapp/jquery/digilib.html.orig	Thu Nov 23 20:04:44 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <meta name="viewport" content="initial-scale=1.0"/>
-        <title>Digilib jQuery: fullscreen</title>
-
-        <style type="text/css">
-            body {
-                 background: silver;
-            }
-        </style>
-
-        <script type="text/javascript" src="jquery.min.js"></script>
-        <script type="text/javascript" src="jquery.cookie-range.min.js"></script>
-        <script type="text/javascript" src="jquery.digilib-basic.min.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery.digilib-basic.css" />
-
-        <script type="text/javascript">
-            $(document).ready(function(){
-                var opts = {
-                    interactionMode : 'fullscreen',
-                    showRegionNumbers : true
-                    };
-                var $div = $('div#digilib');
-                $div.digilib(opts);
-            });
-
-        </script>
-    </head>
-
-    <body>
-        <div id="digilib">
-            <p>digilib doesn't work! Please switch on Javascript or notify the server administrator!</p>
-            <img src="http://digilib.sourceforge.net/images/digilib-logo-big.png" />
-        </div>
-    </body>
-</html>
-