Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

prepare push back to sonatype repo

  • Loading branch information...
commit bf9ef2c457fb70e4a5a34dfc777879ca53266c19 1 parent 5e0b6d1
@davidB davidB authored
View
17 .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>
View
9 .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
View
26 README.md
@@ -1,15 +1,15 @@
-m2e-scala
+m2eclipse-scala
========
-[m2e-scala] is a work in progress to ease integration between [m2eclipse] and [scala-ide for eclipse].
+[m2eclipse-scala] is a work in progress to ease integration between [m2eclipse] and [scala-ide for eclipse].
-* issue tracker : [m2e-scala at assembla](http://scala-ide.assembla.com/spaces/m2e-scala/tickets)
+* 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 [m2e-scala] from davidB, by [dowloading](http://github.com/davidB/m2e-scala/downloads) the lastest version of the plugin into your eclipse/dropins directory
+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 ...`
@@ -18,11 +18,11 @@ m2e-scala
The plugin is "valitaded" by importing into eclipse the samples projects :
-* [Scala Only (no java)](http://github.com/davidB/m2e-scala/tree/master/samples/prj-scala-only/)
-* [Scala depends of some java code](http://github.com/davidB/m2e-scala/tree/master/samples/prj-scala-after-java/)
-* [Scala and Java cyclic dependency](http://github.com/davidB/m2e-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/davidB/m2e-scala/tree/master/samples/prj-java-test-in-scala/)
-* [Custom Layout](http://github.com/davidB/m2e-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).
+* [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
@@ -31,8 +31,8 @@ The plugin is "valitaded" by importing into eclipse the samples projects :
* use assembla as "project host" to be under Scala-IDE umbrella
* re-do tycho configuration (to build on any box)
* rename directory
-* replace Sonatype as Vendor by Alchim31
* generate update-site via tycho
+* align groupId/artifactId to m2eclipse-extras
#### 0.0.4
@@ -51,12 +51,12 @@ The plugin is "valitaded" by importing into eclipse the samples projects :
* 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/davidB/m2e-scala/tree/master/samples/
+* 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 m2e-scala project from sonatype and add the following feature
+* 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
@@ -66,7 +66,7 @@ The plugin is "valitaded" by importing into eclipse the samples projects :
[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/
- [m2e-scala]: https://www.assembla.com/wiki/edit/scala-ide/With_M2Eclipse
+ [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/
View
5 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="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="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
View
4 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
View
4 org.maven.ide.eclipse.scala/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ 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,
@@ -13,5 +13,5 @@ Require-Bundle:
org.maven.ide.eclipse.jdt,
org.eclipse.jdt.launching,
ch.epfl.lamp.sdt.core
-Bundle-Vendor: Alchim31
+Bundle-Vendor: Sonatype, Inc.
Export-Package: org.maven.ide.eclipse.scala
View
13 org.maven.ide.eclipse.scala/pom.xml
@@ -3,11 +3,18 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.alchim31.m2e-scala</groupId>
- <artifactId>m2e-scala</artifactId>
+ <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-SNAPSHOT</version>
+ <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>
View
6 org.maven.ide.eclipse.scala_feature/.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>
View
12 org.maven.ide.eclipse.scala_feature/.project
@@ -6,12 +6,24 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
View
6 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
View
9 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
View
6 org.maven.ide.eclipse.scala_feature/feature.xml
@@ -3,14 +3,14 @@
id="org.maven.ide.eclipse.scala_feature"
label="Maven Integration for Scala IDE"
version="0.0.5"
- provider-name="Alchim31">
+ provider-name="Sonatype, Inc.">
- <description url="github.com/davidB/m2e-scala/">
+ <description url="github.com/sonatype/m2eclipse-scala/">
Ease m2eclipse + scala-ide (eclipse plugin) integration
</description>
<url>
- <update label="m2e-scala" url="http://alchim31.net/m2e-scala/update-site"/>
+ <update label="m2eclipse-scala" url="http://alchim31.net/m2e-scala/update-site"/>
</url>
<plugin
View
4 org.maven.ide.eclipse.scala_feature/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.alchim31.m2e-scala</groupId>
- <artifactId>m2e-scala</artifactId>
+ <groupId>org.maven.ide.eclipse.scala</groupId>
+ <artifactId>m2eclipse-scala</artifactId>
<version>0.0.1</version>
</parent>
View
6 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>
View
12 org.maven.ide.eclipse.scala_site/.project
@@ -6,12 +6,24 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.UpdateSiteBuilder</name>
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.UpdateSiteNature</nature>
</natures>
</projectDescription>
View
6 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
View
9 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
View
4 org.maven.ide.eclipse.scala_site/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.alchim31.m2e-scala</groupId>
- <artifactId>m2e-scala</artifactId>
+ <groupId>org.maven.ide.eclipse.scala</groupId>
+ <artifactId>m2eclipse-scala</artifactId>
<version>0.0.1</version>
</parent>
View
10 pom.xml
@@ -2,18 +2,20 @@
<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>
- <groupId>net.alchim31.m2e-scala</groupId>
- <artifactId>m2e-scala</artifactId>
+ <groupId>org.maven.ide.eclipse.scala</groupId>
+ <artifactId>m2eclipse-scala</artifactId>
<version>0.0.1</version>
<packaging>pom</packaging>
<properties>
<tycho.version>0.8.0</tycho.version>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
<encoding>UTF-8</encoding>
</properties>
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
<modules>
<module>org.maven.ide.eclipse.scala</module>
<module>org.maven.ide.eclipse.scala_feature</module>
Please sign in to comment.
Something went wrong with that request. Please try again.