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/oa | |
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/oa')
-rw-r--r-- | id/oa/.classpath | 31 | ||||
-rw-r--r-- | id/oa/.codepro/deadCodeEntryPoints.xml | 12 | ||||
-rw-r--r-- | id/oa/.gitignore | 1 | ||||
-rw-r--r-- | id/oa/.project | 36 | ||||
-rw-r--r-- | id/oa/.settings/.jsdtscope | 13 | ||||
-rw-r--r-- | id/oa/.settings/org.eclipse.core.resources.prefs | 4 | ||||
-rw-r--r-- | id/oa/.settings/org.eclipse.jdt.core.prefs | 8 | ||||
-rw-r--r-- | id/oa/.settings/org.eclipse.m2e.core.prefs | 4 | ||||
-rw-r--r-- | id/oa/.settings/org.eclipse.wst.common.component | 12 | ||||
-rw-r--r-- | id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml | 7 | ||||
-rw-r--r-- | id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.container | 1 | ||||
-rw-r--r-- | id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.name | 1 | ||||
-rw-r--r-- | id/oa/.settings/org.eclipse.wst.validation.prefs | 2 | ||||
-rw-r--r-- | id/oa/.settings/org.maven.ide.eclipse.prefs | 8 | ||||
-rw-r--r-- | id/oa/pom.xml | 4 |
15 files changed, 2 insertions, 142 deletions
diff --git a/id/oa/.classpath b/id/oa/.classpath deleted file mode 100644 index 6a6c8e335..000000000 --- a/id/oa/.classpath +++ /dev/null @@ -1,31 +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"/> - </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/oa/.codepro/deadCodeEntryPoints.xml b/id/oa/.codepro/deadCodeEntryPoints.xml deleted file mode 100644 index 814d580d8..000000000 --- a/id/oa/.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/oa/.gitignore b/id/oa/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/id/oa/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/id/oa/.project b/id/oa/.project deleted file mode 100644 index bc5551a61..000000000 --- a/id/oa/.project +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>moa-id-oa</name> - <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects> - </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/oa/.settings/.jsdtscope b/id/oa/.settings/.jsdtscope deleted file mode 100644 index 3b2886eab..000000000 --- a/id/oa/.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/oa/.settings/org.eclipse.core.resources.prefs b/id/oa/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index abdea9ac0..000000000 --- a/id/oa/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding/<project>=UTF-8 diff --git a/id/oa/.settings/org.eclipse.jdt.core.prefs b/id/oa/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd49..000000000 --- a/id/oa/.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/oa/.settings/org.eclipse.m2e.core.prefs b/id/oa/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/id/oa/.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/oa/.settings/org.eclipse.wst.common.component b/id/oa/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 7fdcd5907..000000000 --- a/id/oa/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> - <wb-module deploy-name="moa-id-oa"> - <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> - <property name="context-root" value="moa-id-oa"/> - <wb-resource deploy-path="/" source-path="src/main/webapp"/> - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> - <property name="java-output-path" value="/target/classes"/> - </wb-module> -</project-modules> diff --git a/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 2a6ae7e75..000000000 --- a/id/oa/.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="1.4"/> -</faceted-project>
\ No newline at end of file diff --git a/id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.container b/id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a48..000000000 --- a/id/oa/.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/oa/.settings/org.eclipse.wst.jsdt.ui.superType.name b/id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6e..000000000 --- a/id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window
\ No newline at end of file diff --git a/id/oa/.settings/org.eclipse.wst.validation.prefs b/id/oa/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb7..000000000 --- a/id/oa/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/id/oa/.settings/org.maven.ide.eclipse.prefs b/id/oa/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 5fed4cf5a..000000000 --- a/id/oa/.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 diff --git a/id/oa/pom.xml b/id/oa/pom.xml index d5b3de522..7965d2157 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -34,7 +34,7 @@ <build> <finalName>oa</finalName> <plugins> -<!-- <plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>properties-maven-plugin</artifactId> <version>1.0-alpha-2</version> @@ -51,7 +51,7 @@ </configuration> </execution> </executions> - </plugin> --> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> |