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 /spss/handbook/clients/referencedData | |
| 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 'spss/handbook/clients/referencedData')
14 files changed, 3 insertions, 132 deletions
| diff --git a/spss/handbook/clients/referencedData/.classpath b/spss/handbook/clients/referencedData/.classpath deleted file mode 100644 index 0cbbeaa3d..000000000 --- a/spss/handbook/clients/referencedData/.classpath +++ /dev/null @@ -1,27 +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 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/spss/handbook/clients/referencedData/.gitignore b/spss/handbook/clients/referencedData/.gitignore deleted file mode 100644 index 934e0e06f..000000000 --- a/spss/handbook/clients/referencedData/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin -/target diff --git a/spss/handbook/clients/referencedData/.project b/spss/handbook/clients/referencedData/.project deleted file mode 100644 index 433b32fa8..000000000 --- a/spss/handbook/clients/referencedData/.project +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> -	<name>moa-spss-handbook-referencedData</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.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.maven.ide.eclipse.maven2Builder</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.maven.ide.eclipse.maven2Nature</nature> -		<nature>org.eclipse.wst.common.project.facet.core.nature</nature> -		<nature>org.eclipse.jdt.core.javanature</nature> -		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> -		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> -		<nature>org.eclipse.wst.jsdt.core.jsNature</nature> -	</natures> -</projectDescription> diff --git a/spss/handbook/clients/referencedData/.settings/.jsdtscope b/spss/handbook/clients/referencedData/.settings/.jsdtscope deleted file mode 100644 index bbb8e68be..000000000 --- a/spss/handbook/clients/referencedData/.settings/.jsdtscope +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> -	<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/spss/handbook/clients/referencedData/.settings/org.eclipse.core.resources.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c020..000000000 --- a/spss/handbook/clients/referencedData/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd49..000000000 --- a/spss/handbook/clients/referencedData/.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/spss/handbook/clients/referencedData/.settings/org.eclipse.m2e.core.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/spss/handbook/clients/referencedData/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.component b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 664cf30ba..000000000 --- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> -  <wb-module deploy-name="moa-spss-handbook-referencedData"> -        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> -        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> -    <property name="java-output-path" value="/target/classes"/> -        <property name="context-root" value="referencedData"/> -  </wb-module> -</project-modules> diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 463771365..000000000 --- a/spss/handbook/clients/referencedData/.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/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.container b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a48..000000000 --- a/spss/handbook/clients/referencedData/.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/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.name b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6e..000000000 --- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window
\ No newline at end of file diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.validation.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb7..000000000 --- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/spss/handbook/clients/referencedData/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/clients/referencedData/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 564125648..000000000 --- a/spss/handbook/clients/referencedData/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Tue Jul 07 16:06:53 CEST 2009 -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/spss/handbook/clients/referencedData/pom.xml b/spss/handbook/clients/referencedData/pom.xml index e34df8ff5..65f8635de 100644 --- a/spss/handbook/clients/referencedData/pom.xml +++ b/spss/handbook/clients/referencedData/pom.xml @@ -10,6 +10,7 @@    <groupId>MOA.spss.handbook</groupId>
    <artifactId>moa-spss-handbook-referencedData</artifactId>
    <packaging>war</packaging>
 +  <version>2.0</version>
    <name>MOA SP/SS Handbook Referenced Data</name>
    <properties>
 @@ -18,7 +19,7 @@    <build>
      <plugins>
 -<!--       <plugin>
 +      <plugin>
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-war-plugin</artifactId>
          <configuration>
 @@ -31,7 +32,7 @@              <addMavenDescriptor>false</addMavenDescriptor>
            </archive>
          </configuration>
 -      </plugin> -->
 +      </plugin>
          		<plugin>
              		<groupId>org.codehaus.mojo</groupId>
 | 
