4 files changed, 18 insertions, 19 deletions

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 8d77ee481..84d2ef6c7 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -82,7 +82,6 @@
 		<dependency>

 			<groupId>axis</groupId>

 			<artifactId>axis</artifactId>

-			<version>1.1</version>

 		</dependency>

 		

 		<dependency>

@@ -190,8 +189,7 @@
 		<dependency>

 			<groupId>commons-fileupload</groupId>

 			<artifactId>commons-fileupload</artifactId>

-            <version>1.3</version>

-		</dependency>

+    </dependency>

 		<dependency>

 			<groupId>commons-httpclient</groupId>

 			<artifactId>commons-httpclient</artifactId>

@@ -322,7 +320,7 @@
 			<plugin>

 				<groupId>org.apache.maven.plugins</groupId>

 				<artifactId>maven-javadoc-plugin</artifactId>

-				<version>2.5</version>

+				<version>2.9.1</version>

 				<configuration>

 					<charset>UTF-8</charset>

 					<docencoding>UTF-8</docencoding>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java
index e7e1e5cbd..f4b5cb4c9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java
@@ -144,7 +144,7 @@ public class CreateXMLSignatureRequestBuilderForeign extends Builder {
         else if (ch == '<')

           out.write("&lt;");

         else if (ch == '>')

-          out.write("&gt;");

+          out.write("&gt;"); 

         else if (ch == 'ä')

           out.write("&auml;");

         else if (ch == 'ö')

@@ -164,7 +164,7 @@ public class CreateXMLSignatureRequestBuilderForeign extends Builder {
       }

     }

     catch (IOException ex) {

-      throw new BuildException("builder.00", new Object[] {"GetIdentityLinkForm", ex.toString()});

+      throw new BuildException("builder.00", new Object[] {"CreateXMLSignatureRequest", ex.toString()});

     }

     return out.toString();

   }

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
index c09cde787..ab93f509c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
@@ -212,28 +212,29 @@ public class GetIdentityLinkFormBuilder extends Builder {
     StringWriter out = new StringWriter();
     try {
       for (int ch = in.read(); ch >= 0; ch = in.read()) {
-        if (ch == '"')
+        if (ch == '"') {
           out.write("&quot;");
-        else if (ch == '<')
+        } else if (ch == '<') {
           out.write("&lt;");
-        else if (ch == '>')
+        } else if (ch == '>') {
           out.write("&gt;");
-        else if (ch == 'ä')
+    	} else if (ch == 'ä') {
           out.write("&auml;");
-        else if (ch == 'ö')
+  		} else if (ch == 'ö') {
           out.write("&ouml;");
-        else if (ch == 'ü')
+		} else if (ch == 'ü') {
           out.write("&uuml;");
-        else if (ch == 'Ä')
+		} else if (ch == 'Ä') {
           out.write("&Auml;");
-        else if (ch == 'Ö')
+		} else if (ch == 'Ö') {
           out.write("&Ouml;");
-        else if (ch == 'Ü')
+		} else if (ch == 'Ü') {
           out.write("&Uuml;");
-        else if (ch == 'ß')
+		} else if (ch == 'ß') {
           out.write("&szlig;");
-        else
+		} else  {
           out.write(ch);
+		}
       }
     }
     catch (IOException ex) {
diff --git a/pom.xml b/pom.xml
index 034ea88de..236655298 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,8 +70,8 @@
                 <configuration>

                     <finalName>moa</finalName>

                     <descriptors>

-              <!--          <descriptor>id/assembly-auth.xml</descriptor>

-                        <descriptor>id/assembly-proxy.xml</descriptor>-->                         

+                        <descriptor>id/assembly-auth.xml</descriptor>

+                        <descriptor>id/assembly-proxy.xml</descriptor>                         

                         <descriptor>spss/assembly.xml</descriptor>

                         <descriptor>spss/assembly-lib.xml</descriptor>

                     </descriptors>