SignatureLocation index bug

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@620 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

8 files changed, 18 insertions, 16 deletions

diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
index ccd29e85..0a34c8f3 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
@@ -79,6 +79,8 @@ import at.gv.egiz.dom.DOMUtils;
 import at.gv.egiz.slbinding.RedirectEventFilter;
 import at.gv.egiz.slbinding.RedirectUnmarshallerListener;
 import org.junit.Ignore;
+import org.w3c.dom.NodeList;
+import static org.junit.Assert.*;
 
 public class SignatureTest {
 
@@ -271,7 +273,7 @@ public class SignatureTest {
     assertNotNull(nextSibling);
     assertTrue("urn:document".equals(nextSibling.getNamespaceURI()));
     assertTrue("Paragraph".equals(nextSibling.getLocalName()));
-    
+
   }
 
   @Test
@@ -311,7 +313,7 @@ public class SignatureTest {
     
     assertNotNull(nextSibling);
     assertTrue("Paragraph".equals(nextSibling.getLocalName()));
-    
+
   }
 
   @Test
@@ -325,13 +327,13 @@ public class SignatureTest {
     
     Node parent = signature.getParent();
     Node nextSibling = signature.getNextSibling();
-    
+
     assertNotNull(parent);
     assertTrue("urn:document".equals(parent.getNamespaceURI()));
     assertTrue("Whole".equals(parent.getLocalName()));
-    
+
     assertNull(nextSibling);
-    
+
   }
 
   @Test
diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_1.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_1.xml
index dac81be7..7cf3f098 100644
--- a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_1.xml
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_1.xml
@@ -18,6 +18,6 @@ cnN0ZSBBYnNhdHogaW4gZGllc2VtIERva3VtZW50LjwvZG9jOlBhcmFncmFwaD4NCiAgPGRvYzpQ
 YXJhZ3JhcGg+VW5kIGljaCBiaW4gZGVyIHp3ZWl0ZSBBYnNhdHogaW4gZGllc2VtIERva3VtZW50

 LjwvZG9jOlBhcmFncmFwaD4NCjwvZG9jOlhNTERvY3VtZW50Pg0K</sl:Base64Content>

     </sl:SignatureEnvironment>

-    <sl:SignatureLocation xmlns:doc="urn:document" Index="2">/doc:XMLDocument</sl:SignatureLocation>

+    <sl:SignatureLocation xmlns:doc="urn:document" Index="1">/doc:XMLDocument</sl:SignatureLocation>

   </sl:SignatureInfo>

 </sl:CreateXMLSignatureRequest>
\ No newline at end of file
diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_2.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_2.xml
index 7d8c7c01..69373acc 100644
--- a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_2.xml
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_2.xml
@@ -8,7 +8,7 @@ cmFwaD4NCiAgICA8UGFyYWdyYXBoIFBhcmFJZD0iUGFyYTIiPlVuZCBpY2ggYmluIGRlciB6d2Vp
 dGUgQWJzYXR6IGluIGRpZXNlbSBEb2t1bWVudC4NCiAgICBJY2ggaGFiZSB3ZWl0ZXJzIGVpbiBl

 aWdlbmVucyBJRC1BdHRyaWJ1dCBiZWtvbW1lbi48L1BhcmFncmFwaD4NCjwvWE1MRG9jdW1lbnQ+</sl:Base64Content>

     </sl:SignatureEnvironment>

-    <sl:SignatureLocation xmlns:doc="urn:document" Index="2">/XMLDocument</sl:SignatureLocation>

+    <sl:SignatureLocation xmlns:doc="urn:document" Index="1">/XMLDocument</sl:SignatureLocation>

     <sl:Supplement>

       <sl:Content Reference="urn:Document.dtd">

         <sl:LocRefContent>testlocal:Document.dtd</sl:LocRefContent>

diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_3.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_3.xml
index 91425a93..c3d8ba26 100644
--- a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_3.xml
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_3.xml
@@ -8,7 +8,7 @@ cmFwaD4NCiAgICA8UGFyYWdyYXBoIFBhcmFJZD0iUGFyYTIiPlVuZCBpY2ggYmluIGRlciB6d2Vp
 dGUgQWJzYXR6IGluIGRpZXNlbSBEb2t1bWVudC4NCiAgICBJY2ggaGFiZSB3ZWl0ZXJzIGVpbiBl

 aWdlbmVucyBJRC1BdHRyaWJ1dCBiZWtvbW1lbi48L1BhcmFncmFwaD4NCjwvWE1MRG9jdW1lbnQ+</sl:Base64Content>

     </sl:SignatureEnvironment>

-    <sl:SignatureLocation xmlns:doc="urn:document" Index="2">/XMLDocument</sl:SignatureLocation>

+    <sl:SignatureLocation xmlns:doc="urn:document" Index="1">/XMLDocument</sl:SignatureLocation>

     <sl:Supplement>

       <sl:Content Reference="urn:Document.dtd">

       	<sl:Base64Content>PCFFTEVNRU5UIFhNTERvY3VtZW50ICgjUENEQVRBIHwgUGFyYWdyYXBoKSo+DQo8IUVMRU1FTlQg

diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Reference_1.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Reference_1.xml
index d1589f24..98a77fb1 100644
--- a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Reference_1.xml
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Reference_1.xml
@@ -1,7 +1,7 @@
 <sl:CreateXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">

   <sl:SignatureInfo>

     <sl:SignatureEnvironment Reference="testlocal:SignatureEnvironment1.xml"/>

-    <sl:SignatureLocation Index="0" xmlns:doc="urn:document">id("Para2")</sl:SignatureLocation>

+    <sl:SignatureLocation Index="1" xmlns:doc="urn:document">id("Para2")</sl:SignatureLocation>

     <sl:Supplement>

       <sl:Content Reference="urn:XMLDocument.xsd">

         <sl:LocRefContent>testlocal:XMLDocument.xsd</sl:LocRefContent>

diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_XMLContent_1.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_XMLContent_1.xml
index 79e91992..e0a97e33 100644
--- a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_XMLContent_1.xml
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_XMLContent_1.xml
@@ -8,6 +8,6 @@
         </doc:Whole>

       </sl:XMLContent>

     </sl:SignatureEnvironment>

-    <sl:SignatureLocation xmlns:doc="urn:document" Index="4">/doc:Whole</sl:SignatureLocation>

+    <sl:SignatureLocation xmlns:doc="urn:document" Index="5">/doc:Whole</sl:SignatureLocation>

   </sl:SignatureInfo>

 </sl:CreateXMLSignatureRequest>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 22d3afed..afdd5cdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>2.0.2</version>
+          <version>2.1</version>
           <configuration>
             <!--
 						<fork>true</fork>
@@ -85,7 +85,7 @@
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>2.2-beta-4</version>
+          <version>2.2-beta-5</version>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -99,12 +99,12 @@
         <plugin>
           <artifactId>jaxws-maven-plugin</artifactId>
           <groupId>org.codehaus.mojo</groupId>
-          <version>1.10</version>
+          <version>1.12</version>
         </plugin>
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>2.0-beta-7</version>
+          <version>2.0-beta-9</version>
         </plugin>
         <plugin>
           <artifactId>maven-buildnumber-plugin</artifactId>
@@ -121,7 +121,7 @@
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
           <groupId>org.apache.maven.plugins</groupId>
-          <version>2.2</version>
+          <version>2.3</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/utils/pom.xml b/utils/pom.xml
index 670f273c..14bf7e74 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -74,4 +74,4 @@
 		<id>maven-repository.dev.java.net</id> <name>Java.net Maven 1
 		Repository (legacy)</name> <url>http://download.java.net/maven/1</url>
 		<layout>legacy</layout> </pluginRepository> </pluginRepositories -->
-</project>
\ No newline at end of file
+</project>