diff options
| author | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2013-09-04 09:37:31 +0200 |
|---|---|---|
| committer | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2013-09-04 09:37:31 +0200 |
| commit | eadd6dd97f1b30608b31ffcd90382874fbcdaddc (patch) | |
| tree | 1e02de018bcb417bf897f06fb79bf64eda9b4b06 /id/server/proxy | |
| parent | 61362f940ca679fe215de34b1683e1110fea8d3e (diff) | |
| parent | 69f2dfdf3e0b5d976df3cdece6a8ead4848d746a (diff) | |
| download | moa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.tar.gz moa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.tar.bz2 moa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.zip | |
Merge SPSS
Diffstat (limited to 'id/server/proxy')
8 files changed, 8 insertions, 37 deletions
diff --git a/id/server/proxy/.settings/.jsdtscope b/id/server/proxy/.settings/.jsdtscope deleted file mode 100644 index f40dd98e2..000000000 --- a/id/server/proxy/.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/id/server/proxy/.settings/org.eclipse.jdt.core.prefs b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs index dd0489559..dc0892a32 100644 --- a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs +++ b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ -#Thu Dec 27 15:45:25 CET 2012
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
+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.5
diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-left.r1113 b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-left.r1113 deleted file mode 100644 index 5ffa1b7e5..000000000 --- a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-left.r1113 +++ /dev/null @@ -1,5 +0,0 @@ -#Wed Aug 22 09:50:03 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.compiler.compliance=1.3
diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-right.r1113 b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-right.r1113 deleted file mode 100644 index 88af5dc39..000000000 --- a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-right.r1113 +++ /dev/null @@ -1,7 +0,0 @@ -#Thu May 28 10:03:21 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.working b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.working deleted file mode 100644 index 53bd4313d..000000000 --- a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.working +++ /dev/null @@ -1,7 +0,0 @@ -#Tue Jul 07 16:07:23 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/id/server/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.container b/id/server/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a48..000000000 --- a/id/server/proxy/.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/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.name b/id/server/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6e..000000000 --- a/id/server/proxy/.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/proxy/pom.xml b/id/server/proxy/pom.xml index 4e7ca3d3a..ca91c6139 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -21,7 +21,8 @@ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1.1</version>
+ <!-- <version>2.0.2</version>-->
<configuration>
<archive>
<manifest>
|