diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-21 08:57:31 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-21 08:57:31 +0200 |
commit | e46fd963799f681d69b1eb7f886979e87e0d6340 (patch) | |
tree | f704d0effa2cc07bbcfb402da99aa2c2961472d9 /id/ConfigWebTool | |
parent | 9766fca0bafff04a06b617d63c89c4b26cc21db4 (diff) | |
download | moa-id-spss-e46fd963799f681d69b1eb7f886979e87e0d6340.tar.gz moa-id-spss-e46fd963799f681d69b1eb7f886979e87e0d6340.tar.bz2 moa-id-spss-e46fd963799f681d69b1eb7f886979e87e0d6340.zip |
Revert "update version management"
This reverts commit e147bdb7da8e48c1483c7732a0eb6b6f54699b66.
Conflicts:
id/ConfigWebTool/pom.xml
Diffstat (limited to 'id/ConfigWebTool')
16 files changed, 2 insertions, 216 deletions
diff --git a/id/ConfigWebTool/.classpath b/id/ConfigWebTool/.classpath deleted file mode 100644 index 8a0fc7b4e..000000000 --- a/id/ConfigWebTool/.classpath +++ /dev/null @@ -1,37 +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 excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> - <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.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/ConfigWebTool/.codepro/deadCodeEntryPoints.xml b/id/ConfigWebTool/.codepro/deadCodeEntryPoints.xml deleted file mode 100644 index 814d580d8..000000000 --- a/id/ConfigWebTool/.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/ConfigWebTool/.gitignore b/id/ConfigWebTool/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/id/ConfigWebTool/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/id/ConfigWebTool/.project b/id/ConfigWebTool/.project deleted file mode 100644 index fa6341ffb..000000000 --- a/id/ConfigWebTool/.project +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>ConfigurationInterface</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> - <arguments> - </arguments> - </buildCommand> - <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.jem.workbench.JavaEMFNature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.wst.jsdt.core.jsNature</nature> - </natures> -</projectDescription> diff --git a/id/ConfigWebTool/.settings/.jsdtscope b/id/ConfigWebTool/.settings/.jsdtscope deleted file mode 100644 index b46b9207a..000000000 --- a/id/ConfigWebTool/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <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/ConfigWebTool/.settings/com.wdev91.eclipse.copyright.xml b/id/ConfigWebTool/.settings/com.wdev91.eclipse.copyright.xml deleted file mode 100644 index 2d8100491..000000000 --- a/id/ConfigWebTool/.settings/com.wdev91.eclipse.copyright.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<project> - <owner>Thomas Lenz</owner> - <copyright><![CDATA[Copyright 2003 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.]]></copyright> - <header contentId="org.eclipse.pde.fragmentManifest" excluded="true" /> - <header contentId="org.eclipse.pde.pluginProperties" excluded="true" /> - <header contentId="org.eclipse.pde.productFile" excluded="true" /> - <header contentId="org.eclipse.jst.j2ee.appclientDD" excluded="true" /> - <header contentId="org.eclipse.ant.core.antBuildFile" excluded="true" /> - <header contentId="org.eclipse.pde.simpleCheatSheet" excluded="true" /> - <header contentId="org.eclipse.core.runtime.xml" postBlankLines="0" lineFormat="false" preserveFirstLine="true"> - <beginLine><![CDATA[<!--]]></beginLine> - <linePrefix><![CDATA[ ]]></linePrefix> - <endLine><![CDATA[-->]]></endLine> - <firstLinePattern><![CDATA[<\?xml version=.*\?>]]></firstLinePattern> - </header> - <header contentId="org.eclipse.jst.j2ee.webDD" excluded="true" /> - <header contentId="org.eclipse.pde.compositeCheatSheet" excluded="true" /> - <header contentId="org.eclipse.pde.schema" excluded="true" /> - <header contentId="org.eclipse.jst.j2ee.earDD" excluded="true" /> - <header contentId="org.eclipse.pde.tocFile" excluded="true" /> - <header contentId="org.eclipse.pde.ctxHelpFile" excluded="true" /> - <header contentId="org.eclipse.pde.categoryManifest" excluded="true" /> - <header contentId="org.eclipse.jdt.core.JARManifest" excluded="true" /> - <header contentId="org.eclipse.pde.buildProperties" excluded="true" /> - <header contentId="org.eclipse.ui.views.log.log" excluded="true" /> - <header contentId="org.eclipse.pde.siteManifest" excluded="true" /> - <header contentId="org.eclipse.pde.bundleManifest" excluded="true" /> - <header contentId="org.eclipse.pde.targetFile" excluded="true" /> - <header contentId="org.eclipse.jst.j2ee.connectorDD" excluded="true" /> - <header contentId="org.eclipse.pde.pluginManifest" excluded="true" /> - <header contentId="org.eclipse.core.runtime.text" postBlankLines="0" lineFormat="true" preserveFirstLine="false"> - <beginLine><![CDATA[#-------------------------------------------------------------------------------]]></beginLine> - <linePrefix><![CDATA[# ]]></linePrefix> - <endLine><![CDATA[#-------------------------------------------------------------------------------]]></endLine> - </header> - <header contentId="org.eclipse.jst.j2ee.ejbDD" excluded="true" /> - <header contentId="org.eclipse.pde.featureManifest" excluded="true" /> - <header contentId="org.eclipse.jdt.core.javaSource" postBlankLines="0" lineFormat="false" preserveFirstLine="false"> - <beginLine><![CDATA[/*******************************************************************************]]></beginLine> - <linePrefix><![CDATA[ * ]]></linePrefix> - <endLine><![CDATA[ ******************************************************************************/]]></endLine> - </header> -</project> diff --git a/id/ConfigWebTool/.settings/org.eclipse.core.resources.prefs b/id/ConfigWebTool/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf9995..000000000 --- a/id/ConfigWebTool/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +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//src/test/resources=UTF-8 -encoding/<project>=UTF-8 diff --git a/id/ConfigWebTool/.settings/org.eclipse.jdt.core.prefs b/id/ConfigWebTool/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1b9..000000000 --- a/id/ConfigWebTool/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/id/ConfigWebTool/.settings/org.eclipse.m2e.core.prefs b/id/ConfigWebTool/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/id/ConfigWebTool/.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/ConfigWebTool/.settings/org.eclipse.wst.common.component b/id/ConfigWebTool/.settings/org.eclipse.wst.common.component deleted file mode 100644 index fadfb1189..000000000 --- a/id/ConfigWebTool/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> - <wb-module deploy-name="ConfigurationInterface"> - <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/java"/> - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/> - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/> - <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="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> - <property name="context-root" value="ConfigurationInterface"/> - <property name="java-output-path" value="/ConfigurationInterface/target/classes"/> - </wb-module> -</project-modules> diff --git a/id/ConfigWebTool/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/ConfigWebTool/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index ef2778943..000000000 --- a/id/ConfigWebTool/.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="wst.jsdt.web"/> - <installed facet="java" version="1.5"/> - <installed facet="jst.web" version="2.5"/> - <installed facet="wst.jsdt.web" version="1.0"/> -</faceted-project> diff --git a/id/ConfigWebTool/.settings/org.eclipse.wst.jsdt.ui.superType.container b/id/ConfigWebTool/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a48..000000000 --- a/id/ConfigWebTool/.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/ConfigWebTool/.settings/org.eclipse.wst.jsdt.ui.superType.name b/id/ConfigWebTool/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6e..000000000 --- a/id/ConfigWebTool/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window
\ No newline at end of file diff --git a/id/ConfigWebTool/.settings/org.eclipse.wst.validation.prefs b/id/ConfigWebTool/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb7..000000000 --- a/id/ConfigWebTool/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index 01359e38a..e777a52ac 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -143,7 +143,7 @@ <build> <plugins> -<!-- <plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>properties-maven-plugin</artifactId> <version>1.0-alpha-2</version> @@ -160,7 +160,7 @@ </configuration> </execution> </executions> - </plugin> --> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/id/ConfigWebTool/src/main/webapp/images/Thumbs.db b/id/ConfigWebTool/src/main/webapp/images/Thumbs.db Binary files differdeleted file mode 100644 index d396c36dd..000000000 --- a/id/ConfigWebTool/src/main/webapp/images/Thumbs.db +++ /dev/null |