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/auth/.classpath                          | 32 -----------------
 id/server/auth/.codepro/deadCodeEntryPoints.xml    | 12 -------
 id/server/auth/.gitignore                          |  3 --
 id/server/auth/.project                            | 40 ----------------------
 id/server/auth/.settings/.jsdtscope                | 13 -------
 .../.settings/org.eclipse.core.resources.prefs     |  5 ---
 .../auth/.settings/org.eclipse.jdt.core.prefs      |  8 -----
 .../auth/.settings/org.eclipse.m2e.core.prefs      |  4 ---
 .../.settings/org.eclipse.wst.common.component     | 29 ----------------
 .../org.eclipse.wst.common.project.facet.core.xml  |  7 ----
 .../org.eclipse.wst.jsdt.ui.superType.container    |  1 -
 .../org.eclipse.wst.jsdt.ui.superType.name         |  1 -
 .../.settings/org.eclipse.wst.validation.prefs     |  2 --
 .../auth/.settings/org.maven.ide.eclipse.prefs     |  8 -----
 14 files changed, 165 deletions(-)
 delete mode 100644 id/server/auth/.classpath
 delete mode 100644 id/server/auth/.codepro/deadCodeEntryPoints.xml
 delete mode 100644 id/server/auth/.gitignore
 delete mode 100644 id/server/auth/.project
 delete mode 100644 id/server/auth/.settings/.jsdtscope
 delete mode 100644 id/server/auth/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 id/server/auth/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 id/server/auth/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 id/server/auth/.settings/org.eclipse.wst.common.component
 delete mode 100644 id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.container
 delete mode 100644 id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.name
 delete mode 100644 id/server/auth/.settings/org.eclipse.wst.validation.prefs
 delete mode 100644 id/server/auth/.settings/org.maven.ide.eclipse.prefs

(limited to 'id/server/auth')

diff --git a/id/server/auth/.classpath b/id/server/auth/.classpath
deleted file mode 100644
index b645d7579..000000000
--- a/id/server/auth/.classpath
+++ /dev/null
@@ -1,32 +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 excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<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 kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/server/auth/.codepro/deadCodeEntryPoints.xml b/id/server/auth/.codepro/deadCodeEntryPoints.xml
deleted file mode 100644
index 814d580d8..000000000
--- a/id/server/auth/.codepro/deadCodeEntryPoints.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by Code Pro -->
-<entry-points
-		version="1">
-	<explicit-entry-points/>
-	<include-main
-			enabled="true"/>
-	<include-tests
-			enabled="false"/>
-	<include-xml
-			enabled="true"/>
-</entry-points>
\ No newline at end of file
diff --git a/id/server/auth/.gitignore b/id/server/auth/.gitignore
deleted file mode 100644
index 0b1e2434c..000000000
--- a/id/server/auth/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/bin
-/target
diff --git a/id/server/auth/.project b/id/server/auth/.project
deleted file mode 100644
index a90b7bf5f..000000000
--- a/id/server/auth/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-id-auth</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-		<project>moa-spss-lib</project>
-		<project>moa-common</project>
-		<project>stork-saml-engine</project>
-		<project>moa-id-commons</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/server/auth/.settings/.jsdtscope b/id/server/auth/.settings/.jsdtscope
deleted file mode 100644
index 3b2886eab..000000000
--- a/id/server/auth/.settings/.jsdtscope
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
-	<classpathentry kind="src" path="src/main/webapp"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/id/server/auth/.settings/org.eclipse.core.resources.prefs b/id/server/auth/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 839d647ee..000000000
--- a/id/server/auth/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/id/server/auth/.settings/org.eclipse.jdt.core.prefs b/id/server/auth/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/id/server/auth/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/id/server/auth/.settings/org.eclipse.m2e.core.prefs b/id/server/auth/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/server/auth/.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/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 9216b6340..000000000
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="moa-id-auth">
-        <dependent-module archiveName="moa-spss-lib-2.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-common-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-id-lib-2.1.0-RC1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-id-commons-2.1.0-RC1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="SamlEngine-1.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/SamlEngine/SamlEngine">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="Commons-1.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/Commons/Commons">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-    <property name="context-root" value="moa-id-auth"/>
-    <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-    <property name="java-output-path" value="/target/classes"/>
-  </wb-module>
-</project-modules>
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 463771365..000000000
--- a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="2.3"/>
-  <installed facet="jst.java" version="1.6"/>
-</faceted-project>
diff --git a/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.container b/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a48..000000000
--- a/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.name b/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b6e..000000000
--- a/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/id/server/auth/.settings/org.eclipse.wst.validation.prefs b/id/server/auth/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/server/auth/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/server/auth/.settings/org.maven.ide.eclipse.prefs b/id/server/auth/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 5fed4cf5a..000000000
--- a/id/server/auth/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
-- 
cgit v1.2.3