diff options
author | Joakim Erdfelt | 2012-01-25 21:20:00 +0000 |
---|---|---|
committer | Joakim Erdfelt | 2012-01-25 21:20:00 +0000 |
commit | 12f4ce8efeeb1457bbad12d64f00311d8cac4edc (patch) | |
tree | 79c12271df5176146d163473bc711b2d02e54a4a | |
parent | ff4ddfa2d765d4ac756ac126391a18486b6446f4 (diff) | |
download | org.eclipse.jetty.wtp-12f4ce8efeeb1457bbad12d64f00311d8cac4edc.tar.gz org.eclipse.jetty.wtp-12f4ce8efeeb1457bbad12d64f00311d8cac4edc.tar.xz org.eclipse.jetty.wtp-12f4ce8efeeb1457bbad12d64f00311d8cac4edc.zip |
Updating to M2E 1.0 (now at eclipse.org)
-rw-r--r-- | .project | 4 | ||||
-rw-r--r-- | org.eclipse.jst.server.jetty.core/.classpath | 3 | ||||
-rw-r--r-- | org.eclipse.jst.server.jetty.core/.project | 4 | ||||
-rw-r--r-- | org.eclipse.jst.server.jetty.feature/.project | 10 | ||||
-rw-r--r-- | org.eclipse.jst.server.jetty.site/.project | 10 | ||||
-rw-r--r-- | org.eclipse.jst.server.jetty.ui.websocket/.classpath | 3 | ||||
-rw-r--r-- | org.eclipse.jst.server.jetty.ui.websocket/.project | 4 | ||||
-rw-r--r-- | org.eclipse.jst.server.jetty.ui/.classpath | 3 | ||||
-rw-r--r-- | org.eclipse.jst.server.jetty.ui/.project | 4 |
9 files changed, 27 insertions, 18 deletions
@@ -6,12 +6,12 @@ </projects> <buildSpec> <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> + <name>org.eclipse.m2e.core.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> </natures> </projectDescription> diff --git a/org.eclipse.jst.server.jetty.core/.classpath b/org.eclipse.jst.server.jetty.core/.classpath index 0679af8..798048d 100644 --- a/org.eclipse.jst.server.jetty.core/.classpath +++ b/org.eclipse.jst.server.jetty.core/.classpath @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/org.eclipse.jst.server.jetty.core/.project b/org.eclipse.jst.server.jetty.core/.project index 9371390..0d6e4e5 100644 --- a/org.eclipse.jst.server.jetty.core/.project +++ b/org.eclipse.jst.server.jetty.core/.project @@ -21,14 +21,14 @@ </arguments> </buildCommand> <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> + <name>org.eclipse.m2e.core.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> </natures> </projectDescription> diff --git a/org.eclipse.jst.server.jetty.feature/.project b/org.eclipse.jst.server.jetty.feature/.project index e4382d3..fdcb960 100644 --- a/org.eclipse.jst.server.jetty.feature/.project +++ b/org.eclipse.jst.server.jetty.feature/.project @@ -21,14 +21,20 @@ </arguments> </buildCommand> <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.FeatureNature</nature> </natures> </projectDescription> diff --git a/org.eclipse.jst.server.jetty.site/.project b/org.eclipse.jst.server.jetty.site/.project index 4ffc271..814e4e6 100644 --- a/org.eclipse.jst.server.jetty.site/.project +++ b/org.eclipse.jst.server.jetty.site/.project @@ -21,14 +21,20 @@ </arguments> </buildCommand> <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.UpdateSiteBuilder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.pde.UpdateSiteNature</nature> </natures> </projectDescription> diff --git a/org.eclipse.jst.server.jetty.ui.websocket/.classpath b/org.eclipse.jst.server.jetty.ui.websocket/.classpath index 0679af8..798048d 100644 --- a/org.eclipse.jst.server.jetty.ui.websocket/.classpath +++ b/org.eclipse.jst.server.jetty.ui.websocket/.classpath @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/org.eclipse.jst.server.jetty.ui.websocket/.project b/org.eclipse.jst.server.jetty.ui.websocket/.project index 47df5a1..f41ed7f 100644 --- a/org.eclipse.jst.server.jetty.ui.websocket/.project +++ b/org.eclipse.jst.server.jetty.ui.websocket/.project @@ -26,15 +26,15 @@ </arguments> </buildCommand> <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> + <name>org.eclipse.m2e.core.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.emf.codegen.jet.IJETNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> </natures> </projectDescription> diff --git a/org.eclipse.jst.server.jetty.ui/.classpath b/org.eclipse.jst.server.jetty.ui/.classpath index 0679af8..798048d 100644 --- a/org.eclipse.jst.server.jetty.ui/.classpath +++ b/org.eclipse.jst.server.jetty.ui/.classpath @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/org.eclipse.jst.server.jetty.ui/.project b/org.eclipse.jst.server.jetty.ui/.project index a25c15e..40790e1 100644 --- a/org.eclipse.jst.server.jetty.ui/.project +++ b/org.eclipse.jst.server.jetty.ui/.project @@ -21,14 +21,14 @@ </arguments> </buildCommand> <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> + <name>org.eclipse.m2e.core.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> </natures> </projectDescription> |