try to fix conflict (override)

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>m2eclipse-scala</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>

org.sonatype.maven.scala.plugin/.settings/org.maven.ide.eclipse.prefs → .settings/org.maven.ide.eclipse.prefs

@@ -1,4 +1,4 @@
-#Thu Mar 25 05:38:54 PDT 2010
+#Sat Jun 19 16:26:45 CEST 2010
 activeProfiles=
 eclipse.preferences.version=1
 fullBuildGoals=process-test-resources

README.md

@@ -0,0 +1,73 @@
+m2eclipse-scala
+========
+
+[m2eclipse-scala] is a work in progress to ease integration between [m2eclipse] and [scala-ide for eclipse].
+
+* issue tracker : [m2eclipse-scala at assembla](http://scala-ide.assembla.com/spaces/m2eclipse-scala/tickets)
+* mailing-list : [scala-ide-user](http://groups.google.fr/group/scala-ide-user)
+* update-site : not available (use dropins directory see below for install)
+
+### Install
+1. install [m2eclipse]
+2. install [m2eclipse-scala] from davidB, by [dowloading](http://github.com/sonatype/m2eclipse-scala/downloads) the lastest version of the plugin  into your eclipse/dropins directory
+3. Eclipse : `File > import > maven > Existing Maven Project ...`
+
+
+
+### Working configuration
+
+The plugin is "valitaded" by importing into eclipse the samples projects :
+
+* [Scala Only (no java)](http://github.com/sonatype/m2eclipse-scala/tree/master/samples/prj-scala-only/)
+* [Scala depends of some java code](http://github.com/sonatype/m2eclipse-scala/tree/master/samples/prj-scala-after-java/)
+* [Scala and Java cyclic dependency](http://github.com/sonatype/m2eclipse-scala/tree/master/samples/prj-scala-cycle-java/) (configuration longer than mono direction scala -> java or java -> scala to compile under maven)
+* [Java main code and Scala for test](http://github.com/sonatype/m2eclipse-scala/tree/master/samples/prj-java-test-in-scala/)
+* [Custom Layout](http://github.com/sonatype/m2eclipse-scala/tree/master/samples/prj-custom-layout/) java + scala cyclic dependencies, java+scala under the same source folder `src` and `test` (for test source folder).
+
+### Changes
+
+#### 0.0.5 (wip)
+
+* use assembla as "project host" to be under Scala-IDE umbrella
+* re-do tycho configuration (to build on any box)
+* rename directory
+* generate update-site via tycho
+* align groupId/artifactId to m2eclipse-extras
+
+#### 0.0.4
+
+
+* include a workaround to run JUnit test, but right-click on JUnit test doesn't propose 'Run as unit test'. Tu run as junit :
+  * select source file and use keybord shortcut (Alt+Shit+X T)
+    * source file have to be named with test class name and being in the 'right' directory (like in java)
+    * I only test with annotation (see source of samples projects listed on wiki)
+  * create JUnit Launch configuration
+
+#### 0.0.3
+
+* try to fix a issue (NPE) if default folders doesn't exist
+
+#### 0.0.2
+
+
+* auto add "src/main/scala" and "src/test/scala" if you don't use goal "add-sources" (nor <sourceDirectory>)
+* add samples project http://github.com/sonatype/m2eclipse-scala/tree/master/samples/
+* put documentation at https://www.assembla.com/wiki/show/scala-ide/With_M2Eclipse
+
+#### 0.0.1
+
+* I fork the m2eclipse-scala project from sonatype and add the following feature
+* remove of scala-library, scala-compiler, scala-dbc, scala-swing from "Maven Dependencies" Container (under eclipse only)
+* re-order JRE Container and Scala Container (to avoid scala.ScalaObject NotFound and C° when use "Run As Scala Application")
+* add Scala-tools.org catalog
+
+
+   [maven-scala-plugin]: http://scala-tools.org/mvnsites/maven-scala-plugin/
+   [maven-eclipse-plugin]: http://maven.apache.org/plugins/maven-eclipse-plugin
+   [build-helper-maven-plugin]: http://mojo.codehaus.org/build-helper-maven-plugin/
+   [m2eclipse]: http://m2eclipse.sonatype.org/
+   [m2eclipse-scala]: https://www.assembla.com/wiki/edit/scala-ide/With_M2Eclipse
+   [IAM]: http://www.eclipse.org/iam/
+   [Q4E]: http://code.google.com/p/q4e/
+   [ESMi]: http://code.google.com/p/esmi/
+   [scala-ide for eclipse]: http://scala-ide.assembla.com/

org.sonatype.maven.scala.tests/.classpath → org.maven.ide.eclipse.scala/.classpath

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<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="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.sonatype.maven.scala.plugin/.settings/org.eclipse.jdt.core.prefs → org.maven.ide.eclipse.scala/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Wed May 28 22:08:02 EDT 2008
+#Sat Jun 19 16:29:55 CEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -38,7 +38,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

org.sonatype.maven.scala.plugin/META-INF/MANIFEST.MF → org.maven.ide.eclipse.scala/META-INF/MANIFEST.MF

@@ -4,18 +4,14 @@ Bundle-Name: Maven Integration for Scala IDE
 Bundle-SymbolicName: org.maven.ide.eclipse.scala;singleton:=true
 Bundle-Version: 0.0.5.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: 
+Require-Bundle:
  org.eclipse.jdt.core,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.maven.ide.eclipse,
  org.maven.ide.eclipse.maven_embedder,
  org.maven.ide.eclipse.jdt,
- scala.tools.nsc;bundle-version="2.8.0",
- org.eclipse.debug.core;bundle-version="3.5.1",
- org.eclipse.jdt.launching;bundle-version="3.5.1"
-Bundle-Vendor: Sonatype, Inc. / DavidB
+ org.eclipse.jdt.launching,
+ ch.epfl.lamp.sdt.core
+Bundle-Vendor: Sonatype, Inc.
 Export-Package: org.maven.ide.eclipse.scala
-Import-Package: scala.tools.eclipse
-Bundle-Activator: org.maven.ide.eclipse.scala.Activator
-Bundle-ActivationPolicy: lazy

org.maven.ide.eclipse.scala/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.maven.ide.eclipse.scala</groupId>
+    <artifactId>m2eclipse-scala</artifactId>
+    <version>0.0.1</version>
+  </parent>
+  <artifactId>org.maven.ide.eclipse.scala</artifactId>
+  <version>0.0.5</version>
+  <packaging>eclipse-plugin</packaging>
+
+  <properties>
+    <maven.compiler.source>1.5</maven.compiler.source>
+    <maven.compiler.target>1.5</maven.compiler.target>
+    <encoding>UTF-8</encoding>
+  </properties>
+
+</project>

org.sonatype.maven.scala.plugin/src/org/maven/ide/eclipse/scala/ScalaProjectConfigurator.java → org.maven.ide.eclipse.scala/src/org/maven/ide/eclipse/scala/ScalaProjectConfigurator.java

@@ -44,7 +44,7 @@
  */
 public class ScalaProjectConfigurator extends AbstractProjectConfigurator implements IJavaProjectConfigurator {
 
-  public static String NATURE_ID = "ch.epfl.lamp.sdt.core.scalanature";
+  public static String NATURE_ID = ScalaPlugin.plugin().natureId();//"ch.epfl.lamp.sdt.core.scalanature";
   public static String MOJO_GROUP_ID = "org.scala-tools";
   public static String MOJO_ARTIFACT_ID = "maven-scala-plugin";
 
@@ -53,16 +53,14 @@ public class ScalaProjectConfigurator extends AbstractProjectConfigurator implem
   @Override
   public void configure(ProjectConfigurationRequest request, IProgressMonitor monitor) throws CoreException {
     try {
-    //MavenProject mavenProject = request.getMavenProject();
-    if (request != null)  {
-    IProject project = request.getProject();
-    if(!project.hasNature(NATURE_ID) && isScalaProject(request.getMavenProjectFacade(), monitor)) {
-      addNature(project, NATURE_ID, monitor);
-    }
-    }
+      if (request != null)  {
+        IProject project = request.getProject();
+        if(!project.hasNature(NATURE_ID) && isScalaProject(request.getMavenProjectFacade(), monitor)) {
+          addNature(project, NATURE_ID, monitor);
+        }
+      }
     } catch(Exception e) {
       e.printStackTrace();
-//      throw e;
     }
   }
 

org.sonatype.maven.scala.plugin/.classpath → org.maven.ide.eclipse.scala_feature/.classpath

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<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="src" path="src/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.sonatype.maven.scala.feature/.project → org.maven.ide.eclipse.scala_feature/.project

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.maven.ide.eclipse.scala.feature</name>
+	<name>org.maven.ide.eclipse.scala_feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.pde.FeatureBuilder</name>
 			<arguments>
@@ -17,6 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>

org.maven.ide.eclipse.scala_feature/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,6 @@
+#Sat Jun 19 16:26:45 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.4

org.maven.ide.eclipse.scala_feature/.settings/org.maven.ide.eclipse.prefs

@@ -0,0 +1,9 @@
+#Sat Jun 19 16:26:45 CEST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1

org.maven.ide.eclipse.scala_feature/build.properties

@@ -0,0 +1 @@
+bin.includes = feature.xml

org.maven.ide.eclipse.scala_feature/feature.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.maven.ide.eclipse.scala_feature"
+      label="Maven Integration for Scala IDE"
+      version="0.0.5"
+      provider-name="Sonatype, Inc.">
+
+   <description url="github.com/sonatype/m2eclipse-scala/">
+      Ease m2eclipse + scala-ide (eclipse plugin) integration
+   </description>
+
+   <url>
+      <update label="m2eclipse-scala" url="http://alchim31.net/m2e-scala/update-site"/>
+   </url>
+
+   <plugin
+         id="org.maven.ide.eclipse.scala"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

org.maven.ide.eclipse.scala_feature/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.maven.ide.eclipse.scala</groupId>
+    <artifactId>m2eclipse-scala</artifactId>
+    <version>0.0.1</version>
+  </parent>
+
+  <artifactId>org.maven.ide.eclipse.scala_feature</artifactId>
+  <version>0.0.5</version>
+  <packaging>eclipse-feature</packaging>
+
+</project>

org.maven.ide.eclipse.scala_site/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

org.sonatype.maven.scala.tests/.project → org.maven.ide.eclipse.scala_site/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.maven.ide.eclipse.scala.tests</name>
+	<name>org.maven.ide.eclipse.scala_site</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -11,24 +11,19 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
+			<name>org.eclipse.pde.UpdateSiteBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.UpdateSiteNature</nature>
 	</natures>
 </projectDescription>

org.maven.ide.eclipse.scala_site/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,6 @@
+#Sat Jun 19 16:26:46 CEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.4

org.maven.ide.eclipse.scala_site/.settings/org.maven.ide.eclipse.prefs

@@ -0,0 +1,9 @@
+#Sat Jun 19 16:26:45 CEST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1

org.maven.ide.eclipse.scala_site/pom.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.maven.ide.eclipse.scala</groupId>
+    <artifactId>m2eclipse-scala</artifactId>
+    <version>0.0.1</version>
+  </parent>
+
+  <artifactId>org.maven.ide.eclipse.scala_site</artifactId>
+  <packaging>eclipse-update-site</packaging>
+  <name>Maven Integration for Scala IDE</name>
+</project>

org.maven.ide.eclipse.scala_site/site.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <description name="Maven Integration for Scala IDE">
+      Maven Integration for Scala IDE
+   </description>
+   <feature url="features/org.maven.ide.eclipse.scala_feature_0.0.5.jar" id="org.maven.ide.eclipse.scala_feature" version="0.0.0"/>
+</site>