Changeset 17216

Timestamp:

08/07/08 23:55:12 (5 years ago)

Author:

int128

Message:

update Eclipse and Maven settings

Location:

lang/java/slideboard/trunk

Files:

• .classpath (modified) (1 diff)
• .externalToolBuilders (deleted)
• .project (modified) (2 diffs)
• .settings/net.skirnir.eclipse.maven.prefs (modified) (1 diff)
• .settings/org.eclipse.jst.common.project.facet.core.prefs (modified) (1 diff)
• .settings/org.eclipse.wst.common.component (modified) (1 diff)
• .settings/org.eclipse.wst.common.project.facet.core.xml (modified) (1 diff)
• .settings/org.maven.ide.eclipse.prefs (modified) (1 diff)
• pom.xml (modified) (1 diff)

lang/java/slideboard/trunk/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src/main/java"/>
-        <classpathentry kind="src" path="src/main/resources"/>
+        <classpathentry excluding="**" kind="src" path="src/main/resources"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_06"/>
         <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
         <classpathentry kind="output" path="webapp/WEB-INF/classes"/>

lang/java/slideboard/trunk/.project

@@ -12 +12 @@
                 </buildCommand>
                 <buildCommand>
-                        <name>org.eclipse.wst.common.project.facet.core.builder</name>
+                        <name>org.eclipse.jdt.core.javabuilder</name>
                         <arguments>
                         </arguments>
                 </buildCommand>
                 <buildCommand>
-                        <name>org.eclipse.jdt.core.javabuilder</name>
+                        <name>org.eclipse.wst.common.project.facet.core.builder</name>
                         <arguments>
                         </arguments>
@@ -27 +27 @@
                 </buildCommand>
                 <buildCommand>
-                        <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-                        <triggers>full,incremental,</triggers>
+                        <name>org.maven.ide.eclipse.maven2Builder</name>
                         <arguments>
-                                <dictionary>
-                                        <key>LaunchConfigHandle</key>
-                                        <value>&lt;project&gt;/.externalToolBuilders/net.skirnir.eclipse.maven.webinfLibBuilder.launch</value>
-                                </dictionary>
                         </arguments>
                 </buildCommand>
                 <buildCommand>
-                        <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-                        <triggers>full,incremental,</triggers>
+                        <name>net.skirnir.eclipse.maven.webinfLibBuilder</name>
                         <arguments>
-                                <dictionary>
-                                        <key>LaunchConfigHandle</key>
-                                        <value>&lt;project&gt;/.externalToolBuilders/org.maven.ide.eclipse.maven2Builder.launch</value>
-                                </dictionary>
                         </arguments>
                 </buildCommand>

lang/java/slideboard/trunk/.settings/net.skirnir.eclipse.maven.prefs

@@ -1 @@
-#Wed Aug 06 17:12:55 JST 2008
+#Thu Aug 07 23:48:21 JST 2008
 destination=webapp/WEB-INF/lib
 eclipse.preferences.version=1

lang/java/slideboard/trunk/.settings/org.eclipse.jst.common.project.facet.core.prefs

@@ -1 @@
-#Wed Aug 06 17:48:31 JST 2008
+#Thu Aug 07 23:41:26 JST 2008
 classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.6.0_06/owners=jst.java\:6.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v6.0/owners=jst.web\:2.4;\#system\#
+classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v6.0/owners=jst.web\:2.5
 eclipse.preferences.version=1

lang/java/slideboard/trunk/.settings/org.eclipse.wst.common.component

@@ -3 +3 @@
     <wb-module deploy-name="slideboard">
         <wb-resource deploy-path="/" source-path="/webapp"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <property name="context-root" value="slideboard"/>
         <property name="java-output-path"/>

lang/java/slideboard/trunk/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -2 +2 @@
 <faceted-project>
   <runtime name="Apache Tomcat v6.0"/>
-  <installed facet="jst.web" version="2.4"/>
+  <fixed facet="jst.java"/>
+  <fixed facet="jst.web"/>
   <installed facet="jst.java" version="6.0"/>
+  <installed facet="jst.web" version="2.5"/>
 </faceted-project>

lang/java/slideboard/trunk/.settings/org.maven.ide.eclipse.prefs

@@ -1 @@
-#Wed Aug 06 17:47:29 JST 2008
+#Thu Aug 07 23:47:05 JST 2008
 activeProfiles=
 eclipse.preferences.version=1

lang/java/slideboard/trunk/pom.xml

@@ -65 +65 @@
         <build>
                 <finalName>slideboard</finalName>
+                <sourceDirectory>src/main/java</sourceDirectory>
+                <outputDirectory>webapp/WEB-INF/classes</outputDirectory>
         </build>
 </project>