# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1318208196 -7200
# Node ID 0c36e54a85b58e119ee4ffd25123bf98340e9c65
# Parent fd71a5d17fd91dfbe55708b6a2ae62d12bc98595
add a site
diff -r fd71a5d17fd9 -r 0c36e54a85b5 .hgignore
--- a/.hgignore Sun Oct 09 08:15:37 2011 +0200
+++ b/.hgignore Mon Oct 10 02:56:36 2011 +0200
@@ -1,5 +1,7 @@
syntax: regexp
+^target$
+syntax: regexp
^conflict-editor/\.settings$
syntax: regexp
^conflict-editor/\.classpath$
diff -r fd71a5d17fd9 -r 0c36e54a85b5 pom.xml
--- a/pom.xml Sun Oct 09 08:15:37 2011 +0200
+++ b/pom.xml Mon Oct 10 02:56:36 2011 +0200
@@ -18,6 +18,13 @@
<module>webstart-package</module>
</modules>
+ <distributionManagement>
+ <site>
+ <id>xanthippe</id>
+ <url>scp://xanthippe.dyndns.org/var/www/localhost/htdocs/ConflictEditor</url>
+ </site>
+ </distributionManagement>
+
<build>
<pluginManagement>
<plugins>
@@ -44,5 +51,41 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-twiki</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <!-- add support for ssh/scp site deployment -->
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <inputEncoding>UTF-8</inputEncoding>
+ <outputEncoding>UTF-8</outputEncoding>
+ <reportPlugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <reports>
+ <report>distribution-management</report>
+ <report>index</report>
+ <report>summary</report>
+ </reports>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
diff -r fd71a5d17fd9 -r 0c36e54a85b5 src/site/resources/images/Screenshot.png
Binary file src/site/resources/images/Screenshot.png has changed
diff -r fd71a5d17fd9 -r 0c36e54a85b5 src/site/site.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/site/site.xml Mon Oct 10 02:56:36 2011 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Conflict Editor">
+ <bannerLeft>
+ <name>Conflict Editor</name>
+ <href>http://xanthippe.dyndns.org/ConflictEditor</href>
+ </bannerLeft>
+ <body>
+ <menu ref="reports" inherit="bottom"/>
+ </body>
+</project>
diff -r fd71a5d17fd9 -r 0c36e54a85b5 src/site/twiki/index.twiki
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/site/twiki/index.twiki Mon Oct 10 02:56:36 2011 +0200
@@ -0,0 +1,8 @@
+---+ An editor for couchdb conflicts
+
+<img src="images/Screenshot.png"/>
+
+This is an editor for couchdb conflicts. Point it at a couchdb database and it will list all documents that contain conflicts. When you select a conflict from the list, the conflicting attributes will be displayed. Use the buttons at the bottom of the window to choose between the value from the original or the value from the conflict. Press the save button to resolve the conflict.
+
+---+ Run it!
+<a href="launch.jnlp">Run it</a> right now via Java Web Start.
\ No newline at end of file