License change

copyright headers changed/added
License text added
NOTICE modified


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

1 files changed, 53 insertions, 46 deletions

diff --git a/smcc/src/main/java/at/gv/egiz/smcc/LtEIDCIOKeyDirectory.java b/smcc/src/main/java/at/gv/egiz/smcc/LtEIDCIOKeyDirectory.java
index dfb8e9eb..5f38cb5c 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/LtEIDCIOKeyDirectory.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/LtEIDCIOKeyDirectory.java
@@ -1,46 +1,53 @@
-/*

-* Copyright 2009 Federal Chancellery Austria and

-* Graz University of Technology

-*

-* Licensed under the Apache License, Version 2.0 (the "License");

-* you may not use this file except in compliance with the License.

-* You may obtain a copy of the License at

-*

-*     http://www.apache.org/licenses/LICENSE-2.0

-*

-* Unless required by applicable law or agreed to in writing, software

-* distributed under the License is distributed on an "AS IS" BASIS,

-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-* See the License for the specific language governing permissions and

-* limitations under the License.

-*/

-

-package at.gv.egiz.smcc;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.List;

-

-public class LtEIDCIOKeyDirectory extends LtEIDCIOCertificateDirectory {

-

-	protected List<LtEIDCIOKey> keys;

-	

-	public LtEIDCIOKeyDirectory(byte[] fid) {

-

-		super(fid);

-		keys = new ArrayList<LtEIDCIOKey>();

-	}

-

-    protected void addCIOCertificate(byte[] cio) throws IOException {

-    	

-    	LtEIDCIOKey cioKey = new LtEIDCIOKey(cio);

-

-        log.debug("adding {}", cioKey);

-        keys.add(cioKey);

-    }

-    

-    public List<LtEIDCIOKey> getKeys() {

-    	

-    	return this.keys;

-    }	

-}

+/*
+ * Copyright 2011 by Graz University of Technology, Austria
+ * MOCCA has been developed by the E-Government Innovation Center EGIZ, a joint
+ * initiative of the Federal Chancellery Austria 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.egiz.smcc;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class LtEIDCIOKeyDirectory extends LtEIDCIOCertificateDirectory {
+
+	protected List<LtEIDCIOKey> keys;
+	
+	public LtEIDCIOKeyDirectory(byte[] fid) {
+
+		super(fid);
+		keys = new ArrayList<LtEIDCIOKey>();
+	}
+
+    protected void addCIOCertificate(byte[] cio) throws IOException {
+    	
+    	LtEIDCIOKey cioKey = new LtEIDCIOKey(cio);
+
+        log.debug("adding {}", cioKey);
+        keys.add(cioKey);
+    }
+    
+    public List<LtEIDCIOKey> getKeys() {
+    	
+    	return this.keys;
+    }	
+}