Mercurial > hg > ConflictEditor

changeset 41:0c36e54a85b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a site
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 10 Oct 2011 02:56:36 +0200
parents fd71a5d17fd9
children 7380d8ff1a66
files .hgignore pom.xml src/site/resources/images/Screenshot.png src/site/site.xml src/site/twiki/index.twiki
diffstat 5 files changed, 63 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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$
--- 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>
Binary file src/site/resources/images/Screenshot.png has changed
--- /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>
--- /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