changeset 538:b153f014e3c7 digilibPDF

cleanup and eclipse settings
author casties
date Mon, 11 Oct 2010 11:13:34 +0200
parents bd1080df81ad
children 56ec8c486c19
files client/.classpath client/.project client/.settings/.jsdtscope client/.settings/org.eclipse.jdt.core.prefs client/.settings/org.eclipse.wst.common.component client/.settings/org.eclipse.wst.common.project.facet.core.xml client/.settings/org.eclipse.wst.jsdt.ui.superType.container client/.settings/org.eclipse.wst.jsdt.ui.superType.name client/.settings/org.eclipse.wst.ws.service.policy.prefs client/digitallibrary/META-INF/MANIFEST.MF client/digitallibrary/WEB-INF/digilib-config.xml client/digitallibrary/WEB-INF/lib/DigilibServlet.jar client/digitallibrary/WEB-INF/lib/imageinfo.jar client/digitallibrary/digilib-new.html
diffstat 14 files changed, 111 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/.classpath	Mon Oct 11 11:13:34 2010 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/digilib-servlet"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-openjdk">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/.project	Mon Oct 11 11:13:34 2010 +0200
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>digilib-client</name>
+	<comment></comment>
+	<projects>
+		<project>digilib-servlet</project>
+		<project>digilib-client</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/.settings/.jsdtscope	Mon Oct 11 11:13:34 2010 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="digitallibrary"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/.settings/org.eclipse.jdt.core.prefs	Mon Oct 11 11:13:34 2010 +0200
@@ -0,0 +1,8 @@
+#Fri Oct 08 14:51:02 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/.settings/org.eclipse.wst.common.component	Mon Oct 11 11:13:34 2010 +0200
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="digilib-client">
+        <wb-resource deploy-path="/" source-path="/digitallibrary"/>
+        <dependent-module archiveName="digilib-servlet.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/digilib-servlet/digilib-servlet">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/" handle="org.eclipse.jst.j2ee.componentcore.util.ClasspathDependencies">
+            <dependency-type>consumes</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="digitallibrary"/>
+        <property name="java-output-path" value="/digilib-client/build/classes"/>
+    </wb-module>
+</project-modules>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/.settings/org.eclipse.wst.common.project.facet.core.xml	Mon Oct 11 11:13:34 2010 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="Apache Tomcat v7.0"/>
+  <fixed facet="wst.jsdt.web"/>
+  <fixed facet="java"/>
+  <fixed facet="jst.web"/>
+  <installed facet="java" version="1.5"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/.settings/org.eclipse.wst.jsdt.ui.superType.container	Mon Oct 11 11:13:34 2010 +0200
@@ -0,0 +1,1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/.settings/org.eclipse.wst.jsdt.ui.superType.name	Mon Oct 11 11:13:34 2010 +0200
@@ -0,0 +1,1 @@
+Window
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/.settings/org.eclipse.wst.ws.service.policy.prefs	Mon Oct 11 11:13:34 2010 +0200
@@ -0,0 +1,3 @@
+#Fri Oct 08 14:56:13 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.wst.ws.service.policy.projectEnabled=false
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/digitallibrary/META-INF/MANIFEST.MF	Mon Oct 11 11:13:34 2010 +0200
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
--- a/client/digitallibrary/WEB-INF/digilib-config.xml	Thu Aug 26 17:30:45 2010 +0200
+++ b/client/digitallibrary/WEB-INF/digilib-config.xml	Mon Oct 11 11:13:34 2010 +0200
@@ -59,15 +59,13 @@
   <!-- location of logger config file -->
   <parameter name="log-config-file" value="log4j-config.xml"/>
 
-
-
   <!-- location for PDF files while still in progress -->
-  <parameter name="pdf-temp-dir" value="pdf_temp/" />
+  <parameter name="pdf-temp-dir" value="/tmp/pdf_tmp/" />
   
   <!-- location for PDF files upon completion -->
-  <parameter name="pdf-cache-dir" value="cache/"/>
+  <parameter name="pdf-cache-dir" value="/tmp/pdf_cache/"/>
 
-  <!-- location for PDFs while still in progress -->
+  <!-- logo for PDFs -->
   <parameter name="pdf-logo" value="http://www.mpiwg-berlin.mpg.de/de/images/logo.png" />
 
   
Binary file client/digitallibrary/WEB-INF/lib/DigilibServlet.jar has changed
Binary file client/digitallibrary/WEB-INF/lib/imageinfo.jar has changed
--- a/client/digitallibrary/digilib-new.html	Thu Aug 26 17:30:45 2010 +0200
+++ b/client/digitallibrary/digilib-new.html	Mon Oct 11 11:13:34 2010 +0200
@@ -37,7 +37,7 @@
 
 <body>
 
-<div id="buttons" 
+<div id="buttons">
 	<div class="button">
 		<a
 			class="icon"