From b9e2c8e57097ab446264a4e5f42765c5ed67dceb Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 29 Oct 2014 14:03:53 +0100
Subject: update repository

---
 .../at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar | Bin 0 -> 3869909 bytes
 .../at/gv/util/egovutils/2.0.0/egovutils-2.0.0.pom | 145 +++++++++++++++++++++
 2 files changed, 145 insertions(+)
 create mode 100644 repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar
 create mode 100644 repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.pom

(limited to 'repository/at/gv/util')

diff --git a/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar b/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar
new file mode 100644
index 000000000..c045d89a3
Binary files /dev/null and b/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar differ
diff --git a/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.pom b/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.pom
new file mode 100644
index 000000000..959b311cd
--- /dev/null
+++ b/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.pom
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>at.gv.util</groupId>
+	<artifactId>egovutils</artifactId>
+	<version>2.0.0</version>
+	<name>zuseutil</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<cxf.version>3.0.1</cxf.version>
+	</properties>
+	
+	<build>
+	    <plugins>
+	        <plugin>
+              <groupId>org.owasp</groupId>
+              <artifactId>dependency-check-maven</artifactId>
+              <version>1.2.5</version>
+              <executions>
+                  <execution>
+                  	<phase>verify</phase>
+                    <goals>
+                    	<goal>check</goal>
+                    </goals>
+                  </execution>
+              </executions>
+            </plugin>            
+           	<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>            
+	    </plugins>
+	</build>	
+	
+	
+	<dependencies>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.11.0</version>
+		</dependency>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>2.7.1</version>
+		</dependency>
+<!-- 		<dependency>
+			<groupId>com.sun</groupId>
+			<artifactId>webservices-tools</artifactId>
+			<version>2.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun</groupId>
+			<artifactId>webservices-rt</artifactId>
+			<version>2.0.1</version>
+		</dependency> -->
+<!-- 		<dependency>
+			<groupId>org.glassfish.metro</groupId>
+			<artifactId>webservices-rt</artifactId>
+			<version>2.3</version>
+		</dependency> -->
+		
+		<!-- Apache  CXF libs-->
+    	<dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-frontend-jaxws</artifactId>
+        	<version>${cxf.version}</version>
+    	</dependency>
+    	<dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-transports-http</artifactId>
+        	<version>${cxf.version}</version>
+    	</dependency>
+        	<!-- Jetty is needed if you're are not using the CXFServlet -->
+<!--     	<dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-transports-http-jetty</artifactId>
+        	<version>${cxf.version}</version>
+    	</dependency> -->		
+		
+				
+		<dependency>
+			<groupId>commons-validator</groupId>
+			<artifactId>commons-validator</artifactId>
+			<version>1.4.0</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.9.2</version>
+		</dependency>		
+		<dependency>
+			<groupId>bouncycastle</groupId>
+			<artifactId>bcprov-jdk16</artifactId>
+			<version>140</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.7.7</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.9</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+<!-- 		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+		</dependency> -->
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.3.5</version>
+		</dependency>
+		
+	</dependencies>
+	
+</project>
-- 
cgit v1.2.3


From 5202dc81fd956baac83e0b6551faa455e3de0797 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 30 Oct 2014 16:48:14 +0100
Subject: fix dependency problems

---
 id/server/idserverlib/pom.xml                      |  12 ++++++++++++
 .../protocols/saml1/SAML1AuthenticationServer.java |  18 ++++++++----------
 .../at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar | Bin 3869909 -> 3879829 bytes
 3 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'repository/at/gv/util')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 32c8f5705..52e064d3f 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -75,6 +75,10 @@
 					<artifactId>axis-wsdl4j</artifactId>
 					<groupId>axis</groupId>
 				</exclusion>
+				<exclusion>
+					<artifactId>jaxb-impl</artifactId>
+					<groupId>com.sun.xml.bind</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -115,6 +119,14 @@
                 	<artifactId>bcprov-jdk16</artifactId>
                 	<groupId>bouncycastle</groupId>
                 </exclusion>
+                <exclusion>
+                	<artifactId>jaxb-impl</artifactId>
+                	<groupId>com.sun.xml.bind</groupId>
+                </exclusion>
+                <exclusion>
+                	<artifactId>jaxb-core</artifactId>
+                	<groupId>com.sun.xml.bind</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
 		
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
index 7d3c72630..65e520cc3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
@@ -36,8 +36,6 @@ import javax.xml.transform.TransformerException;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
-import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
-
 import at.gv.egovernment.moa.id.auth.AuthenticationServer;
 import at.gv.egovernment.moa.id.auth.builder.AuthenticationDataAssertionBuilder;
 import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;
@@ -235,14 +233,14 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 				Marshaller m = jc.createMarshaller();
 				m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
 				
-				m.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapper() {
-		            public String getPreferredPrefix(String arg0, String arg1, boolean arg2) {
-		            	if (Constants.PD_NS_URI.equals(arg0))
-		            		return Constants.PD_PREFIX;
-		            	else
-		            		return arg1;
-		            }
-		        });
+//				m.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapper() {
+//		            public String getPreferredPrefix(String arg0, String arg1, boolean arg2) {
+//		            	if (Constants.PD_NS_URI.equals(arg0))
+//		            		return Constants.PD_PREFIX;
+//		            	else
+//		            		return arg1;
+//		            }
+//		        });
 				
 				ByteArrayOutputStream stream = new ByteArrayOutputStream();
 				m.marshal(
diff --git a/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar b/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar
index c045d89a3..29ce1fcbf 100644
Binary files a/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar and b/repository/at/gv/util/egovutils/2.0.0/egovutils-2.0.0.jar differ
-- 
cgit v1.2.3