Mercurial > hg > digilib

changeset 1656:68f65786003e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add jetty plugin to pom.xml and "mvn jetty:run" to README.md
author Robert Casties <r0bcas7@gmail.com>
date Mon, 20 Nov 2017 16:59:28 +0100
parents 22dd14eccdc0
children fb211930d6e8
files README.md pom.xml webapp/pom.xml
diffstat 3 files changed, 36 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/README.md	Tue Nov 14 18:41:22 2017 +0100
+++ b/README.md	Mon Nov 20 16:59:28 2017 +0100
@@ -33,6 +33,31 @@
 or on [SourceForge](https://sourceforge.net/projects/digilib/)
 
 * [Source code](https://github.com/robcast/digilib)
+* [Issue tracker](https://github.com/robcast/digilib/issues)
 * Daily built [WAR files](https://it-dev.mpiwg-berlin.mpg.de/downloads/digilib/daily-build/)
 * Daily built [Javadoc](https://it-dev.mpiwg-berlin.mpg.de/downloads/digilib/daily-build/javadoc/)
 * [Maven repository](http://it-dev.mpiwg-berlin.mpg.de/maven-repo/)
+
+## How do I run digilib?
+
+Requirements:
+* [git](https://git-scm.com/)
+* [Java JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
+* [Maven](https://maven.apache.org/)
+
+Build:
+1. Clone the digilib repository
+
+   `git clone https://github.com/robcast/digilib.git`
+
+2. Change to the repository
+
+   `cd digilib`
+   
+3. build and run the webapp in the embedded Jetty runtime for development
+ 
+   `mvn jetty:run --projects webapp`
+   
+   and watch digilib at http://localhost:8080/digilib.html
+
+or follow the production build instructions in the on https://robcast.github.io/digilib/
--- a/pom.xml	Tue Nov 14 18:41:22 2017 +0100
+++ b/pom.xml	Mon Nov 20 16:59:28 2017 +0100
@@ -13,7 +13,7 @@
 
   <name>digilib</name>
   <description>The Digital Image Library</description>
-  <url>https://github.com/robcast/digilib</url>
+  <url>https://robcast.github.io/digilib/</url>
   <inceptionYear>2001</inceptionYear>
 
   <organization>
@@ -76,8 +76,8 @@
     </license>
   </licenses>
   <scm>
-    <connection>scm:git:git://github.com/robcast/digilib.git</connection>
-    <developerConnection>scm:git:https:github.com:robcast/digilib.git</developerConnection>
+    <connection>scm:git:https://github.com/robcast/digilib.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/robcast/digilib.git</developerConnection>
     <url>https://github.com/robcast/digilib</url>
   </scm>
   <issueManagement>
--- a/webapp/pom.xml	Tue Nov 14 18:41:22 2017 +0100
+++ b/webapp/pom.xml	Mon Nov 20 16:59:28 2017 +0100
@@ -192,6 +192,12 @@
                     </execution> -->
 				</executions>
 			</plugin>
+			<plugin>
+			    <!-- Jetty plugin for "mvn jetty:run" -->
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>9.2.22.v20170606</version>
+            </plugin>
 		</plugins>
 	</build>
 	<profiles>
@@ -386,13 +392,13 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlet</artifactId>
-            <version>9.2.13.v20150730</version>
+            <version>9.2.22.v20170606</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-http</artifactId>
-			<version>9.2.13.v20150730</version>
+			<version>9.2.22.v20170606</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>