From 2151d0b1dd7b2c5199d394c5ae399a36da7670ef Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Wed, 10 Jan 2018 09:17:22 +0100
Subject: - lib update  - switch to version 2.0.2

---
 pom.xml                                            | 29 +++++++++----
 src/main/java/at/gv/util/MiscUtil.java             |  4 --
 .../java/at/gv/util/client/ur_V5/URClient.java     | 50 +++++++++++-----------
 3 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5566397..43394a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.util</groupId>
 	<artifactId>egovutils</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<name>zuseutil</name>
 	<url>http://maven.apache.org</url>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<cxf.version>3.1.6</cxf.version>
+		<cxf.version>3.2.1</cxf.version>
 	</properties>
 	
 	<build>
@@ -89,12 +89,12 @@
  		<dependency>
 			<groupId>commons-validator</groupId>
 			<artifactId>commons-validator</artifactId>
-			<version>1.4.0</version>
+			<version>1.6</version>
 		</dependency>
  		<dependency>
 			<groupId>commons-beanutils</groupId>
 			<artifactId>commons-beanutils</artifactId>
-			<version>1.9.2</version>
+			<version>1.9.3</version>
 		</dependency>		
 		<dependency>
 			<groupId>bouncycastle</groupId>
@@ -104,12 +104,12 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.7</version>
+			<version>1.7.25</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.7</version>
+			<version>1.7.25</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -120,7 +120,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.9</version>
+			<version>1.11</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
@@ -137,7 +137,20 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.3.5</version>
+			<version>4.5.4</version>
+		</dependency>
+		
+		<dependency>
+    		<groupId>commons-collections</groupId>
+    		<artifactId>commons-collections</artifactId>
+    		<version>3.2.2</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_ecc</artifactId>
+			<version>2.19</version>
+			<scope>test</scope>
 		</dependency>
 		
 	</dependencies>
diff --git a/src/main/java/at/gv/util/MiscUtil.java b/src/main/java/at/gv/util/MiscUtil.java
index 6ddca0d..97da3dc 100644
--- a/src/main/java/at/gv/util/MiscUtil.java
+++ b/src/main/java/at/gv/util/MiscUtil.java
@@ -21,8 +21,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.InvocationTargetException;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
@@ -55,8 +53,6 @@ import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-import com.sun.corba.se.spi.ior.Writeable;
-
 import at.gv.util.data.Empty;
 import at.gv.util.ex.EgovUtilException;
 
diff --git a/src/main/java/at/gv/util/client/ur_V5/URClient.java b/src/main/java/at/gv/util/client/ur_V5/URClient.java
index 3855927..6be521e 100644
--- a/src/main/java/at/gv/util/client/ur_V5/URClient.java
+++ b/src/main/java/at/gv/util/client/ur_V5/URClient.java
@@ -87,31 +87,31 @@ public class URClient {
 		initialize();
 	}
 
-//	public List<NichtNatuerlichePersonTyp> searchByRegisterNumberFullInfo(String number, String type, int maxResults) throws Exception {
-//		
-//		SucheUnternehmenNachIdRequest request = new SucheUnternehmenNachIdRequest();
-//
-//		if (type.equals("ERJ")) 		
-//			request.setErj(number);		
-//		else if (type.equals("FBN"))
-//			request.setFbn(number);
-//		else if (type.equals("KUR"))
-//			request.setKur(number);
-//		else if (type.equals("SEK"))
-//			request.setSek(number);
-//		else if (type.equals("ZVR"))
-//			request.setZvr(number);
-//		else
-//			throw new Exception("Wrong RegisterNumber Type");
-//		
-//		request.setMitHistorie(true);
-//				
-//		SearchCriteriaType sct = new SearchCriteriaType();		
-//		sct.setSucheUnternehmenNachIdRequest(request);				
-//		List<ResultRecord> results = searchByExample(sct, -1);
-//
-//		return getNichtNatuerlichePersonen(results);
-//	}
+	public List<URSearchResult> searchByRegisterNumberFullInfo(String number, String type, int maxResults) throws Exception {
+		
+		SucheUnternehmenNachIdRequest request = new SucheUnternehmenNachIdRequest();
+
+		if (type.equals("ERJ")) 		
+			request.setErj(number);		
+		else if (type.equals("FBN"))
+			request.setFbn(number);
+		else if (type.equals("KUR"))
+			request.setKur(number);
+		else if (type.equals("SEK"))
+			request.setSek(number);
+		else if (type.equals("ZVR"))
+			request.setZvr(number);
+		else
+			throw new Exception("Wrong RegisterNumber Type");
+		
+		request.setMitHistorie(true);
+				
+		SearchCriteriaType sct = new SearchCriteriaType();		
+		sct.setSucheUnternehmenNachIdRequest(request);				
+		List<ResultRecord> results = searchByExample(sct, -1);
+
+		return getURSearchResult(results);
+	}
 	
 	public List<URSearchResult> searchByBpk(String vzbpk) throws URClientException {
 		SucheUnternehmenNachBpkRequest request = new SucheUnternehmenNachBpkRequest();
-- 
cgit v1.2.3