advancing to the next era

git-svn-id: https://svn.code.sf.net/p/eclipse-jetty/code/trunk@36 ff76cd2f-afae-4e6e-9b3e-a17054345156
eclipse-jetty · Apr 27, 2012 · 6fbcea2 · 6fbcea2
1 parent 8bf3deb
commit 6fbcea2
Show file tree

Hide file tree

Showing 31 changed files with 2,798 additions and 1,244 deletions.
diff --git a/.project b/.project
@@ -5,7 +5,13 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/features/eclipse-jetty/.project b/features/eclipse-jetty/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/eclipse-jetty-launcher/.classpath b/plugins/eclipse-jetty-launcher/.classpath
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="lib" path="C:/Users/thred/.m2/repository/org/eclipse/jetty/jetty-server/7.6.3.v20120416/jetty-server-7.6.3.v20120416.jar"/>
+	<classpathentry kind="lib" path="C:/Users/thred/.m2/repository/org/eclipse/jetty/jetty-webapp/7.6.3.v20120416/jetty-webapp-7.6.3.v20120416.jar"/>
+	<classpathentry kind="lib" path="C:/Users/thred/.m2/repository/org/eclipse/jetty/jetty-servlet/7.6.3.v20120416/jetty-servlet-7.6.3.v20120416.jar"/>
+	<classpathentry kind="lib" path="C:/Users/thred/.m2/repository/org/eclipse/jetty/jetty-util/7.6.3.v20120416/jetty-util-7.6.3.v20120416.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/eclipse-jetty-launcher/.project b/plugins/eclipse-jetty-launcher/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>

diff --git a/plugins/eclipse-jetty-launcher/plugin.xml b/plugins/eclipse-jetty-launcher/plugin.xml
@@ -34,8 +34,9 @@
    <extension
          point="org.eclipse.jdt.launching.classpathProviders">
       <classpathProvider
-            class="net.sourceforge.eclipsejetty.JettyLaunchConfigurationClassPathProvider"
-            id="net.sourceforge.eclipsejetty.launcher.JettyWebAppClassPathProvider">
+            class="net.sourceforge.eclipsejetty.launch.JettyLaunchConfigurationClassPathProvider"
+            id="net.sourceforge.eclipsejetty.launcher.JettyLaunchClassPathProvider">
       </classpathProvider>
    </extension>
+
 </plugin>