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/templates | |
| 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/templates')
| -rw-r--r-- | id/templates/.project | 7 | ||||
| -rw-r--r-- | id/templates/.settings/org.eclipse.jdt.core.prefs | 5 | ||||
| -rw-r--r-- | id/templates/.settings/org.eclipse.wst.common.component | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/id/templates/.project b/id/templates/.project index ba03abacc..444626a3f 100644 --- a/id/templates/.project +++ b/id/templates/.project @@ -13,8 +13,15 @@ <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ </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>
diff --git a/id/templates/.settings/org.eclipse.jdt.core.prefs b/id/templates/.settings/org.eclipse.jdt.core.prefs index ac2f76dec..5bdae7434 100644 --- a/id/templates/.settings/org.eclipse.jdt.core.prefs +++ b/id/templates/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,9 @@ -#Thu Dec 27 15:45:24 CET 2012
+#Mon Aug 05 10:52:31 CEST 2013
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
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.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/id/templates/.settings/org.eclipse.wst.common.component b/id/templates/.settings/org.eclipse.wst.common.component index 83be1588d..0d2cb24b4 100644 --- a/id/templates/.settings/org.eclipse.wst.common.component +++ b/id/templates/.settings/org.eclipse.wst.common.component @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<project-modules id="moduleCoreId" project-version="2.0">
<wb-module deploy-name="moa-id-templates">
<property name="context-root" value="moa-id-templates"/>
<wb-resource deploy-path="/" source-path="src/main/webapp"/>
<property name="java-output-path" value="/target/classes"/>
</wb-module>
-</project-modules>
+</project-modules>
\ No newline at end of file |