merge master

master
Markus Kreth 9 years ago
parent 4333e585b3
commit 4b417a97e9
  1. 71
      .classpath
  2. 11
      .settings/org.eclipse.wst.common.project.facet.core.xml

@ -1,38 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"> <classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="optional" value="true"/>
</attributes> <attribute name="maven.pomderived" value="true"/>
</classpathentry> </attributes>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"> </classpathentry>
<attributes> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attribute name="optional" value="true"/> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</classpathentry> </attributes>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> </classpathentry>
<attributes> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
<attribute name="maven.pomderived" value="true"/> <attributes>
</attributes> <attribute name="owner.project.facets" value="jst.utility"/>
</classpathentry> </attributes>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> </classpathentry>
<attributes> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<attribute name="maven.pomderived" value="true"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attribute name="org.eclipse.jst.component.nondependency" value=""/> <attributes>
</attributes> <attribute name="owner.project.facets" value="java"/>
</classpathentry> </attributes>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="output" path="target/classes"/>
<attributes> </classpath>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<installed facet="jst.utility" version="1.0"/> <runtime name="Apache Tomcat v7.0"/>
<installed facet="java" version="1.6"/> <installed facet="jst.utility" version="1.0"/>
</faceted-project> <installed facet="java" version="1.6"/>
</faceted-project>

Loading…
Cancel
Save