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
---
 .../.settings/org.eclipse.core.resources.prefs     |  2 --
 .../proxy/.settings/org.eclipse.jdt.core.prefs     |  8 -------
 .../proxy/.settings/org.eclipse.m2e.core.prefs     |  4 ----
 .../.settings/org.eclipse.wst.common.component     | 25 ----------------------
 .../org.eclipse.wst.common.project.facet.core.xml  |  7 ------
 .../.settings/org.eclipse.wst.validation.prefs     |  2 --
 .../proxy/.settings/org.maven.ide.eclipse.prefs    |  8 -------
 7 files changed, 56 deletions(-)
 delete mode 100644 id/server/proxy/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 id/server/proxy/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 id/server/proxy/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 id/server/proxy/.settings/org.eclipse.wst.common.component
 delete mode 100644 id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 id/server/proxy/.settings/org.eclipse.wst.validation.prefs
 delete mode 100644 id/server/proxy/.settings/org.maven.ide.eclipse.prefs

(limited to 'id/server/proxy/.settings')

diff --git a/id/server/proxy/.settings/org.eclipse.core.resources.prefs b/id/server/proxy/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/id/server/proxy/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/id/server/proxy/.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/proxy/.settings/org.eclipse.m2e.core.prefs b/id/server/proxy/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/server/proxy/.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/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 0c677de0e..000000000
--- a/id/server/proxy/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="moa-id-proxy">
-        <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-proxy"/>
-    <wb-resource deploy-path="/" source-path="src/main/webapp"/>
-    <property name="java-output-path" value="/target/classes"/>
-  </wb-module>
-</project-modules>
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 3d344ed7f..000000000
--- a/id/server/proxy/.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.4"/>
-  <installed facet="jst.java" version="5.0"/>
-</faceted-project>
\ No newline at end of file
diff --git a/id/server/proxy/.settings/org.eclipse.wst.validation.prefs b/id/server/proxy/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/server/proxy/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/server/proxy/.settings/org.maven.ide.eclipse.prefs b/id/server/proxy/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 5fed4cf5a..000000000
--- a/id/server/proxy/.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