From 33be86224cfb2dd95a0654b92ae2e36ae1b3a85b Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 24 Oct 2014 13:49:59 +0200
Subject: add authentication role management

---
 .../moa/id/data/AuthenticationRole.java            | 110 ---------------------
 .../moa/id/data/AuthenticationRoleFactory.java     |  76 --------------
 2 files changed, 186 deletions(-)
 delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRole.java
 delete mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java

(limited to 'id/server/idserverlib/src/main/java')

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRole.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRole.java
deleted file mode 100644
index 91514ca62..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRole.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-package at.gv.egovernment.moa.id.data;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author tlenz
- *
- */
-public class AuthenticationRole {
-
-	private String roleName = null;
-	private List<Entry<String, String>> params = null;
-	
-	public AuthenticationRole(String roleName) {
-		this.roleName = roleName;
-	}
-	
-	public void addParameter(String key, String value) {
-		if (params == null)
-			params = new ArrayList<Entry<String,String>>();				
-		params.add(new Entry<String, String>(key, value));
-		
-	}
-	
-	/**
-	 * @return the roleName
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-	
-	/**
-	 * @return the params
-	 */
-	public List<Entry<String, String>> getParams() {
-		return params;
-	}
-	
-	/**
-	 * @return the params
-	 */
-	public Iterator<Entry<String, String>> getParamsInterator() {
-		return params.iterator();
-	}
-	
-	static class Entry<K,V> implements Map.Entry<K,V> {
-
-		private K key;
-		private V value;
-
-		Entry(K k, V v) {
-			key = k;
-			value = v;
-		}
-		
-		/* (non-Javadoc)
-		 * @see java.util.Map.Entry#getKey()
-		 */
-		@Override
-		public K getKey() {
-			return key;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.util.Map.Entry#getValue()
-		 */
-		@Override
-		public V getValue() {
-			return value;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.util.Map.Entry#setValue(java.lang.Object)
-		 */
-		@Override
-		public V setValue(V newValue) {
-            V oldValue = value;
-            value = newValue;
-            return oldValue;
-		}
-		
-		
-	}
-	
-}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java
deleted file mode 100644
index 7d4dc6eff..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-package at.gv.egovernment.moa.id.data;
-
-import java.util.Arrays;
-import java.util.List;
-
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * @author tlenz
- *
- */
-public class AuthenticationRoleFactory {
-
-	public static AuthenticationRole buildFormPVPole(String pvprole) {	
-		AuthenticationRole role = null;
-		
-		int first = pvprole.indexOf("(");
-		
-		if (first < 0) {
-			//no role paramters found
-			role = new AuthenticationRole(pvprole.trim());
-			Logger.debug("Add authentication role with name=" + pvprole.trim());
-			
-		} else {
-			role = new AuthenticationRole(pvprole.substring(0, first).trim());	
-			Logger.debug("Add authentication role with name=" + pvprole.substring(0, first).trim());
-			String params = pvprole.substring(first + 1, pvprole.length() - 1);
-			
-			List<String> param = Arrays.asList(params.split(","));
-			String test = new String();
-			for (String el : param) {
-				test = test.concat(el);
-				if (!test.endsWith("\\") || 
-						(test.endsWith("\\\\") && !test.endsWith("\\\\\\")) ) {
-					String[] keyValue = test.split("=");
-					if (keyValue.length < 2) {
-						role.addParameter(keyValue[0].trim(), "");
-						Logger.debug("Add authentication roleparameter with key=" + keyValue[0].trim());
-						
-					} else {
-						role.addParameter(keyValue[0].trim(), keyValue[1].trim());
-						Logger.debug("Add authentication roleparameter with key=" + keyValue[0].trim() 
-								+ " value=" + keyValue[1].trim());
-						
-					}
-					
-					test = new String();
-				}									
-			}			
-		}
-				
-		return role;		
-	}
-}
-- 
cgit v1.2.3