From e46fd963799f681d69b1eb7f886979e87e0d6340 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 21 May 2014 08:57:31 +0200
Subject: Revert "update version management"

This reverts commit e147bdb7da8e48c1483c7732a0eb6b6f54699b66.

Conflicts:
	id/ConfigWebTool/pom.xml
---
 id/server/moa-id-commons/.classpath                | 38 --------------
 id/server/moa-id-commons/.gitignore                |  1 -
 id/server/moa-id-commons/.project                  | 37 --------------
 .../.settings/org.eclipse.core.resources.prefs     |  5 --
 .../.settings/org.eclipse.jdt.core.prefs           |  5 --
 .../.settings/org.eclipse.jpt.core.prefs           |  3 --
 .../.settings/org.eclipse.m2e.core.prefs           |  4 --
 .../.settings/org.eclipse.wst.common.component     |  7 ---
 ...eclipse.wst.common.project.facet.core.prefs.xml |  7 ---
 .../org.eclipse.wst.common.project.facet.core.xml  |  6 ---
 .../.settings/org.eclipse.wst.validation.prefs     |  2 -
 id/server/moa-id-commons/pom.xml                   |  4 +-
 .../moa/id/commons/xjc/JaxbBooleanAdapter.java     | 59 ----------------------
 13 files changed, 2 insertions(+), 176 deletions(-)
 delete mode 100644 id/server/moa-id-commons/.classpath
 delete mode 100644 id/server/moa-id-commons/.gitignore
 delete mode 100644 id/server/moa-id-commons/.project
 delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs
 delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.wst.common.component
 delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
 delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 id/server/moa-id-commons/.settings/org.eclipse.wst.validation.prefs
 delete mode 100644 id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/xjc/JaxbBooleanAdapter.java

(limited to 'id/server/moa-id-commons')

diff --git a/id/server/moa-id-commons/.classpath b/id/server/moa-id-commons/.classpath
deleted file mode 100644
index a6c84d0a8..000000000
--- a/id/server/moa-id-commons/.classpath
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" path="target/generated-sources/xjc"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources/config">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/server/moa-id-commons/.gitignore b/id/server/moa-id-commons/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/id/server/moa-id-commons/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/id/server/moa-id-commons/.project b/id/server/moa-id-commons/.project
deleted file mode 100644
index a7c3725f2..000000000
--- a/id/server/moa-id-commons/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-id-commons</name>
-	<comment></comment>
-	<projects>
-		<project>moa-common</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.core.resources.prefs b/id/server/moa-id-commons/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 95c6d7ddd..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/resources=UTF-8
-encoding//src/main/resources/config=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs b/id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index abec6ca38..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs b/id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs
deleted file mode 100644
index 3e2d23923..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jpt.core.platform=generic
-org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.m2e.core.prefs b/id/server/moa-id-commons/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.component b/id/server/moa-id-commons/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 9e5e3ed1c..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="moa-id-commons">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/target/generated-sources/xjc"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources/config"/>
-    </wb-module>
-</project-modules>
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
deleted file mode 100644
index 7961132fd..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<root>
-  <facet id="jpt.jpa">
-    <node name="libprov">
-      <attribute name="provider-id" value="jpa-no-op-library-provider"/>
-    </node>
-  </facet>
-</root>
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 8956fb143..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.5"/>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jpt.jpa" version="1.0"/>
-</faceted-project>
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.wst.validation.prefs b/id/server/moa-id-commons/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 02915ef18..608ad0ed9 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -243,7 +243,7 @@
                 </executions>
             </plugin> -->
    
-<!--            	 <plugin>
+           	 <plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -260,7 +260,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
                   
                 <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
                 <plugin>
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/xjc/JaxbBooleanAdapter.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/xjc/JaxbBooleanAdapter.java
deleted file mode 100644
index c1c841282..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/xjc/JaxbBooleanAdapter.java
+++ /dev/null
@@ -1,59 +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.commons.xjc;
-
-/**
- * @author tlenz
- *
- */
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-/**
- * Utility class to correctly render the xml types used in JAXB.
- */
-public class JaxbBooleanAdapter extends XmlAdapter<String, Boolean>
-{
-    @Override
-    public Boolean unmarshal(String v) throws Exception
-    {
-        if ("1".equals(v))
-        {
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public String marshal(Boolean v) throws Exception
-    {
-        if (v == null)
-        {
-            return null;
-        }
-        if (v)
-        {
-            return "1";
-        }
-        return "0";
-    }
-}
-- 
cgit v1.2.3