Convert Eclipse project to Maven based

Ignore exec plugin for m2e in themes and client-compiled.

Change-Id: I1c500a4cf204e3bd09aa0e9ae75e922b463e72fa

diff --git a/.classpath b/.classpath
index 3a407350decc90efbd87823be4f28be0984d1e0f..027a399de87b52dbf2ec32225ebf974390ac559f 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,26 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="server/src/test/java"/>
-       <classpathentry kind="src" path="client/src/test/java"/>
-       <classpathentry kind="src" path="shared/src/test/java"/>
-       <classpathentry kind="src" path="client/src/main/java"/>
-       <classpathentry kind="src" path="server/src/main/java"/>
-       <classpathentry kind="src" path="client-compiler/src/main/java"/>
-       <classpathentry kind="src" path="client-compiler/src/test/java"/>
-       <classpathentry kind="src" path="uitest/src"/>
-       <classpathentry kind="src" path="shared/src/main/java"/>
-       <classpathentry kind="src" path="shared/src/main/java-templates"/>
-       <classpathentry kind="src" path="buildhelpers/src/main/java"/>
-       <classpathentry kind="src" path="widgets/src/main/java"/>
-       <classpathentry kind="src" path="widgets/src/main/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
                <attributes>
-                       <attribute name="owner.project.facets" value="java"/>
+                       <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=build%2Fivy.xml&amp;confs=ide,test&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D"/>
-       <classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=uitest%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D"/>
-       <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-       <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-       <classpathentry kind="output" path="build/classes"/>
+       <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+               <attributes>
+                       <attribute name="maven.pomderived" value="true"/>
+                       <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/.gitignore b/.gitignore
index e11ab9b5a0a64e212e747a2801fdf512d1bf4d0f..405841c5477025a09fd98b57c51556c46b8df9df 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -84,6 +84,7 @@ scripts/*.pyc
 # build result folders
 */result
 result
+target/
 all/target/
 push/target/
 shared/target/

diff --git a/.project b/.project
index a0a79fbcec3f10e7dbf3fb0712934e7a95d784bc..4539834a7d814ae7f9cb532d959b2dcaa2594195 100644 (file)
--- a/.project
+++ b/.project
@@ -20,12 +20,17 @@
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.m2e.core.maven2Builder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
                <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
                <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.apache.ivyde.eclipse.ivynature</nature>
+               <nature>org.eclipse.m2e.core.maven2Nature</nature>
        </natures>
 </projectDescription>

diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644 (file)
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

diff --git a/build.properties b/build.properties
index 332771139c8c10112780e17bd7753e3f41827fd9..2148fc00e6d6c910f466478b4a8e86fb3373a89b 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -4,7 +4,7 @@ ivy.organisation=com.vaadin
 vaadin.vendor=Vaadin Ltd
 vaadin.url=http://vaadin.com
 vaadin.java.version=1.6
-vaadin.version=0.0.0.unversioned-development-build
+vaadin.version=7.7.0-SNAPSHOT
 vaadin.sass.version=0.9.13
 gwt.version=2.7.0.vaadin3
 commons-io.version=2.4

diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml
index 10815470fcb63106dbdde2cf66a5259e399d6419..815fd87261a64acc21ca01f82108d774ecf653cb 100644 (file)
--- a/client-compiled/pom.xml
+++ b/client-compiled/pom.xml
@@ -171,6 +171,41 @@
                                </configuration>
                        </plugin>
                </plugins>
+               <pluginManagement>
+                       <plugins>
+                               <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                               <plugin>
+                                       <groupId>org.eclipse.m2e</groupId>
+                                       <artifactId>lifecycle-mapping</artifactId>
+                                       <version>1.0.0</version>
+                                       <configuration>
+                                               <lifecycleMappingMetadata>
+                                                       <pluginExecutions>
+                                                               <pluginExecution>
+                                                                       <pluginExecutionFilter>
+                                                                               <groupId>
+                                                                                       org.codehaus.mojo
+                                                                               </groupId>
+                                                                               <artifactId>
+                                                                                       exec-maven-plugin
+                                                                               </artifactId>
+                                                                               <versionRange>
+                                                                                       [1.4.0,)
+                                                                               </versionRange>
+                                                                               <goals>
+                                                                                       <goal>exec</goal>
+                                                                               </goals>
+                                                                       </pluginExecutionFilter>
+                                                                       <action>
+                                                                               <ignore />
+                                                                       </action>
+                                                               </pluginExecution>
+                                                       </pluginExecutions>
+                                               </lifecycleMappingMetadata>
+                                       </configuration>
+                               </plugin>
+                       </plugins>
+               </pluginManagement>
        </build>
 
 </project>

diff --git a/eclipse/Development Mode (vaadin).launch b/eclipse/Development Mode (vaadin).launch
index 072b9a57c47fcddca0cdcabb304b38294467c3a6..e29c9cf504cc5a06f0a4b2d6c3e8d48b42f19ea0 100644 (file)
--- a/eclipse/Development Mode (vaadin).launch
+++ b/eclipse/Development Mode (vaadin).launch
@@ -19,9 +19,11 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=gwt%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=uitest%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -war WebContent/VAADIN/widgetsets com.vaadin.terminal.gwt.DefaultWidgetSet -startupUrl http://localhost:8888 -bindAddress 0.0.0.0"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="vaadin"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M -XX:MaxPermSize=256M"/>
 </launchConfiguration>

diff --git a/eclipse/Development Server (vaadin).launch b/eclipse/Development Server (vaadin).launch
index 197344cce04591150c391307011cac682187784e..7d38d84649295e6a4722424f2288f25987a07a84 100644 (file)
--- a/eclipse/Development Server (vaadin).launch
+++ b/eclipse/Development Server (vaadin).launch
@@ -12,9 +12,11 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=uitest%2Fivy.xml&amp;amp;confs=jetty-run&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;vaadin&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.vaadin.launcher.DevelopmentServerLauncher"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--autoreload=build/classes --scaninterval=3"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="vaadin"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
 </launchConfiguration>

diff --git a/eclipse/Super Development Mode (vaadin).launch b/eclipse/Super Development Mode (vaadin).launch
index b03337e5ff0254670610db872dd275e27a2dfcd0..2f5c4fa6a9deb4ca004a5138332e993ffb1b114e 100644 (file)
--- a/eclipse/Super Development Mode (vaadin).launch
+++ b/eclipse/Super Development Mode (vaadin).launch
@@ -19,9 +19,11 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=gwt%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=uitest%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.codeserver.CodeServer"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noprecompile -strict -bindAddress 0.0.0.0 com.vaadin.DefaultWidgetSet  com.vaadin.tests.widgetset.TestingWidgetSet"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="vaadin"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1G -XX:MaxPermSize=256M"/>
 </launchConfiguration>

diff --git a/themes/pom.xml b/themes/pom.xml
index 672f425456730c73bb77308b3832bda223cd487a..eb8990b6dfc4c117437ac1083accade2a7ba3af4 100644 (file)
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -216,6 +216,42 @@
                                </configuration>
                        </plugin>
                </plugins>
+
+               <pluginManagement>
+                       <plugins>
+                               <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                               <plugin>
+                                       <groupId>org.eclipse.m2e</groupId>
+                                       <artifactId>lifecycle-mapping</artifactId>
+                                       <version>1.0.0</version>
+                                       <configuration>
+                                               <lifecycleMappingMetadata>
+                                                       <pluginExecutions>
+                                                               <pluginExecution>
+                                                                       <pluginExecutionFilter>
+                                                                               <groupId>
+                                                                                       org.codehaus.mojo
+                                                                               </groupId>
+                                                                               <artifactId>
+                                                                                       exec-maven-plugin
+                                                                               </artifactId>
+                                                                               <versionRange>
+                                                                                       [1.4.0,)
+                                                                               </versionRange>
+                                                                               <goals>
+                                                                                       <goal>exec</goal>
+                                                                               </goals>
+                                                                       </pluginExecutionFilter>
+                                                                       <action>
+                                                                               <ignore />
+                                                                       </action>
+                                                               </pluginExecution>
+                                                       </pluginExecutions>
+                                               </lifecycleMappingMetadata>
+                                       </configuration>
+                               </plugin>
+                       </plugins>
+               </pluginManagement>
        </build>
 
 </project>