Skip to content

Commit 77ce708

Browse files
author
Joerg Huber
committed
Upadated settings
1 parent 00d5cbc commit 77ce708

8 files changed

Lines changed: 41 additions & 49 deletions

‎SIF3InfraREST/.classpath‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="sif3Common/src"/>
4-
<classpathentry kind="src" path="sif3InfraModel/src"/>
5-
<classpathentry kind="src" path="sif3InfraCommon/src"/>
6-
<classpathentry kind="src" path="sif3InfraREST/src"/>
7-
<classpathentry kind="src" path="demo/src"/>
8-
<classpathentry kind="src" path="test/src"/>
9-
<classpathentry excluding="consumers/|providers/|hibernate/" kind="src" path="config"/>
10-
<classpathentry kind="src" path="config/hibernate"/>
11-
<classpathentry kind="src" path="config/consumers"/>
12-
<classpathentry kind="src" path="config/providers"/>
13-
<classpathentry kind="lib" path="lib/jaxb/jaxb-api.jar"/>
14-
<classpathentry kind="lib" path="lib/jaxb/jaxb-impl.jar"/>
15-
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
3+
<classpathentry kind="src" path="src/main/java"/>
4+
<classpathentry kind="src" path="src/main/resources"/>
5+
<classpathentry kind="src" path="src/test/java"/>
6+
<classpathentry excluding="config/|config/providers/|config/providers/|config/hibernate/|config/hibernate/|config/environments/|config/environments/|config/consumers/|config/consumers/|config/" kind="src" path="src/test/resources"/>
7+
<classpathentry kind="src" path="src/test/resources/config/providers"/>
8+
<classpathentry kind="src" path="src/test/resources/config/hibernate"/>
9+
<classpathentry kind="src" path="src/test/resources/config/consumers"/>
10+
<classpathentry excluding="providers/|hibernate/|environments/|consumers/" kind="src" path="src/test/resources/config"/>
1611
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
17-
<classpathentry kind="lib" path="lib/xml/dom4j-1.6.1.jar"/>
18-
<classpathentry kind="lib" path="lib/jdbc/mysql.jar"/>
1912
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
2013
<attributes>
21-
<attribute name="owner.project.facets" value="jst.web"/>
14+
<attribute name="owner.project.facets" value="jst.utility"/>
15+
</attributes>
16+
</classpathentry>
17+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_51_64bit">
18+
<attributes>
19+
<attribute name="owner.project.facets" value="java"/>
2220
</attributes>
2321
</classpathentry>
24-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
2522
<classpathentry kind="output" path="build/classes"/>
2623
</classpath>

‎SIF3InfraREST/.project‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
<projects>
66
</projects>
77
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
138
<buildCommand>
149
<name>org.eclipse.jdt.core.javabuilder</name>
1510
<arguments>
@@ -21,7 +16,7 @@
2116
</arguments>
2217
</buildCommand>
2318
<buildCommand>
24-
<name>org.eclipse.wst.validation.validationbuilder</name>
19+
<name>org.eclipse.m2e.core.maven2Builder</name>
2520
<arguments>
2621
</arguments>
2722
</buildCommand>
@@ -31,6 +26,6 @@
3126
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
3227
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
3328
<nature>org.eclipse.jdt.core.javanature</nature>
34-
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
29+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3530
</natures>
3631
</projectDescription>

‎SIF3InfraREST/.settings/.jsdtscope‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="war"/>
4-
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
5-
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
6-
<attributes>
7-
<attribute name="hide" value="true"/>
8-
</attributes>
9-
</classpathentry>
10-
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
114
<classpathentry kind="output" path=""/>
125
</classpath>

‎SIF3InfraREST/.settings/org.eclipse.core.resources.prefs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8

‎SIF3InfraREST/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.compliance=1.7
5+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
6+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7+
org.eclipse.jdt.core.compiler.source=1.7

‎SIF3InfraREST/.settings/org.eclipse.m2e.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎SIF3InfraREST/.settings/org.eclipse.wst.common.component‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project-modules id="moduleCoreId" project-version="1.5.0">
1+
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
32
<wb-module deploy-name="SIF3InfraREST">
4-
<wb-resource deploy-path="/" source-path="/war"/>
5-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/test/src"/>
6-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/demo/src"/>
73
<wb-resource deploy-path="/WEB-INF/classes" source-path="/sif3infrarest/src"/>
8-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/sif3InfraREST/src"/>
9-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/sif3InfraCommon/src"/>
10-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/config"/>
11-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/config/providers"/>
124
<wb-resource deploy-path="/WEB-INF/classes" source-path="/config/consumers"/>
13-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/sif3Common/src"/>
14-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/config/hibernate"/>
15-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/sif3InfraModel/src"/>
5+
<wb-resource deploy-path="/" source-path="/src/main/java"/>
6+
<wb-resource deploy-path="/" source-path="/src/main/resources"/>
7+
<wb-resource deploy-path="/" source-path="/src/test/java"/>
8+
<wb-resource deploy-path="/" source-path="/src/test/resources"/>
9+
<wb-resource deploy-path="/" source-path="/src/test/resources/config/providers"/>
10+
<wb-resource deploy-path="/" source-path="/src/test/resources/config/hibernate"/>
11+
<wb-resource deploy-path="/" source-path="/src/test/resources/config/consumers"/>
12+
<wb-resource deploy-path="/" source-path="/src/test/resources/config"/>
1613
<property name="context-root" value="SIF3InfraREST"/>
1714
<property name="java-output-path" value="/SIF3InfraREST/build/classes"/>
1815
</wb-module>

‎SIF3InfraREST/.settings/org.eclipse.wst.common.project.facet.core.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<faceted-project>
33
<runtime name="Apache Tomcat v7.0"/>
4-
<fixed facet="java"/>
5-
<fixed facet="jst.web"/>
6-
<fixed facet="wst.jsdt.web"/>
7-
<installed facet="java" version="1.6"/>
8-
<installed facet="wst.jsdt.web" version="1.0"/>
9-
<installed facet="jst.web" version="3.0"/>
4+
<fixed facet="jst.utility"/>
5+
<installed facet="java" version="1.7"/>
6+
<installed facet="jst.utility" version="1.0"/>
107
</faceted-project>

0 commit comments

Comments
 (0)