# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1348827313 -7200
# Node ID bedc87d11596a413172d8e327c068a57ff6f73e7
# Parent  48ae19f19f79ca5006629e5444d97620b37c73a8# Parent  a8b6b4924f4e6c3c433f9dd7d4dae249c9854275
dummy merge for repo head

diff -r a8b6b4924f4e -r bedc87d11596 ChangeLog
--- a/ChangeLog	Fri Sep 07 13:09:11 2012 +0000
+++ b/ChangeLog	Fri Sep 28 12:15:13 2012 +0200
@@ -1,3 +1,17 @@
+2012-09-26	Björn Ricks	<bjoern.ricks@intevation.de>
+
+	* artifact-database/src/main/java/de/intevation/artifactdatabase/state/AbstractState.java:
+	  New method addOutput to allow subclasses to add Output object manually.
+
+2012-09-17  Ingo Weinzierl <ingo@intevation.de>
+
+	Tagged RELEASE 2.9.1
+
+2012-09-10	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* artifacts/pom.xml, pom.xml: source 1.5 -> 1.6
+	  (@Override annotations for interface implementations is 1.6).
+
 2012-09-07	Björn Ricks	<bjoern.ricks@intevation.de>
 
 	* artifact-database/src/main/resources/sql/org-h2-driver.properties,
diff -r a8b6b4924f4e -r bedc87d11596 artifact-database/src/main/java/de/intevation/artifactdatabase/state/AbstractState.java
--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/state/AbstractState.java	Fri Sep 07 13:09:11 2012 +0000
+++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/state/AbstractState.java	Fri Sep 28 12:15:13 2012 +0200
@@ -274,10 +274,18 @@
         int size = outs.getLength();
 
         for (int i = 0; i < size; i++) {
-            outputs.add(buildOutput(outs.item(i)));
+            addOutput(buildOutput(outs.item(i)));
         }
     }
 
+    /**
+     * This methods allows subclasses to manually add outputs
+     *
+     * @param out The output to add
+     */
+    protected void addOutput(Output out) {
+        outputs.add(out);
+    }
 
     /**
      * A helper method that creates an Output object based on the <i>out</i>
diff -r a8b6b4924f4e -r bedc87d11596 artifacts/pom.xml
--- a/artifacts/pom.xml	Fri Sep 07 13:09:11 2012 +0000
+++ b/artifacts/pom.xml	Fri Sep 28 12:15:13 2012 +0200
@@ -22,8 +22,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.0.2</version>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.6</source>
+          <target>1.6</target>
         </configuration>
       </plugin>
       <plugin>
diff -r a8b6b4924f4e -r bedc87d11596 pom.xml
--- a/pom.xml	Fri Sep 07 13:09:11 2012 +0000
+++ b/pom.xml	Fri Sep 28 12:15:13 2012 +0200
@@ -27,8 +27,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.0.2</version>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.6</source>
+          <target>1.6</target>
         </configuration>
       </plugin>
       <plugin>