Browse Source

Convert Eclipse project to Maven based

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

Change-Id: I1c500a4cf204e3bd09aa0e9ae75e922b463e72fa
tags/7.7.0.alpha1
Henri Sara 3 years ago
parent
commit
7c6710191b

+ 8
- 19
.classpath View File

@@ -1,26 +1,15 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <classpath>
3
-	<classpathentry kind="src" path="server/src/test/java"/>
4
-	<classpathentry kind="src" path="client/src/test/java"/>
5
-	<classpathentry kind="src" path="shared/src/test/java"/>
6
-	<classpathentry kind="src" path="client/src/main/java"/>
7
-	<classpathentry kind="src" path="server/src/main/java"/>
8
-	<classpathentry kind="src" path="client-compiler/src/main/java"/>
9
-	<classpathentry kind="src" path="client-compiler/src/test/java"/>
10
-	<classpathentry kind="src" path="uitest/src"/>
11
-	<classpathentry kind="src" path="shared/src/main/java"/>
12
-	<classpathentry kind="src" path="shared/src/main/java-templates"/>
13
-	<classpathentry kind="src" path="buildhelpers/src/main/java"/>
14
-	<classpathentry kind="src" path="widgets/src/main/java"/>
15
-	<classpathentry kind="src" path="widgets/src/main/resources"/>
16 3
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
17 4
 		<attributes>
18
-			<attribute name="owner.project.facets" value="java"/>
5
+			<attribute name="maven.pomderived" value="true"/>
19 6
 		</attributes>
20 7
 	</classpathentry>
21
-	<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"/>
22
-	<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"/>
23
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
24
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
25
-	<classpathentry kind="output" path="build/classes"/>
8
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
9
+		<attributes>
10
+			<attribute name="maven.pomderived" value="true"/>
11
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
12
+		</attributes>
13
+	</classpathentry>
14
+	<classpathentry kind="output" path="target/classes"/>
26 15
 </classpath>

+ 1
- 0
.gitignore View File

@@ -84,6 +84,7 @@ scripts/*.pyc
84 84
 # build result folders
85 85
 */result
86 86
 result
87
+target/
87 88
 all/target/
88 89
 push/target/
89 90
 shared/target/

+ 6
- 1
.project View File

@@ -20,12 +20,17 @@
20 20
 			<arguments>
21 21
 			</arguments>
22 22
 		</buildCommand>
23
+		<buildCommand>
24
+			<name>org.eclipse.m2e.core.maven2Builder</name>
25
+			<arguments>
26
+			</arguments>
27
+		</buildCommand>
23 28
 	</buildSpec>
24 29
 	<natures>
25 30
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
26 31
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
27 32
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
28 33
 		<nature>org.eclipse.jdt.core.javanature</nature>
29
-		<nature>org.apache.ivyde.eclipse.ivynature</nature>
34
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
30 35
 	</natures>
31 36
 </projectDescription>

+ 4
- 0
.settings/org.eclipse.m2e.core.prefs View File

@@ -0,0 +1,4 @@
1
+activeProfiles=
2
+eclipse.preferences.version=1
3
+resolveWorkspaceProjects=true
4
+version=1

+ 1
- 1
build.properties View File

@@ -4,7 +4,7 @@ ivy.organisation=com.vaadin
4 4
 vaadin.vendor=Vaadin Ltd
5 5
 vaadin.url=http://vaadin.com
6 6
 vaadin.java.version=1.6
7
-vaadin.version=0.0.0.unversioned-development-build
7
+vaadin.version=7.7.0-SNAPSHOT
8 8
 vaadin.sass.version=0.9.13
9 9
 gwt.version=2.7.0.vaadin3
10 10
 commons-io.version=2.4

+ 35
- 0
client-compiled/pom.xml View File

@@ -171,6 +171,41 @@
171 171
 				</configuration>
172 172
 			</plugin>
173 173
 		</plugins>
174
+		<pluginManagement>
175
+			<plugins>
176
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
177
+				<plugin>
178
+					<groupId>org.eclipse.m2e</groupId>
179
+					<artifactId>lifecycle-mapping</artifactId>
180
+					<version>1.0.0</version>
181
+					<configuration>
182
+						<lifecycleMappingMetadata>
183
+							<pluginExecutions>
184
+								<pluginExecution>
185
+									<pluginExecutionFilter>
186
+										<groupId>
187
+											org.codehaus.mojo
188
+										</groupId>
189
+										<artifactId>
190
+											exec-maven-plugin
191
+										</artifactId>
192
+										<versionRange>
193
+											[1.4.0,)
194
+										</versionRange>
195
+										<goals>
196
+											<goal>exec</goal>
197
+										</goals>
198
+									</pluginExecutionFilter>
199
+									<action>
200
+										<ignore />
201
+									</action>
202
+								</pluginExecution>
203
+							</pluginExecutions>
204
+						</lifecycleMappingMetadata>
205
+					</configuration>
206
+				</plugin>
207
+			</plugins>
208
+		</pluginManagement>
174 209
 	</build>
175 210
 
176 211
 </project>

+ 2
- 0
eclipse/Development Mode (vaadin).launch View File

@@ -19,9 +19,11 @@
19 19
 <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;"/>
20 20
 <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;"/>
21 21
 </listAttribute>
22
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
22 23
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
23 24
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
24 25
 <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"/>
25 26
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="vaadin"/>
27
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
26 28
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M -XX:MaxPermSize=256M"/>
27 29
 </launchConfiguration>

+ 2
- 0
eclipse/Development Server (vaadin).launch View File

@@ -12,9 +12,11 @@
12 12
 <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;"/>
13 13
 <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;"/>
14 14
 </listAttribute>
15
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
15 16
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
16 17
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.vaadin.launcher.DevelopmentServerLauncher"/>
17 18
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--autoreload=build/classes --scaninterval=3"/>
18 19
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="vaadin"/>
20
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
19 21
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
20 22
 </launchConfiguration>

+ 2
- 0
eclipse/Super Development Mode (vaadin).launch View File

@@ -19,9 +19,11 @@
19 19
 <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;"/>
20 20
 <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;"/>
21 21
 </listAttribute>
22
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
22 23
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
23 24
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.codeserver.CodeServer"/>
24 25
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noprecompile -strict -bindAddress 0.0.0.0 com.vaadin.DefaultWidgetSet  com.vaadin.tests.widgetset.TestingWidgetSet"/>
25 26
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="vaadin"/>
27
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
26 28
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1G -XX:MaxPermSize=256M"/>
27 29
 </launchConfiguration>

+ 36
- 0
themes/pom.xml View File

@@ -216,6 +216,42 @@
216 216
 				</configuration>
217 217
 			</plugin>
218 218
 		</plugins>
219
+
220
+		<pluginManagement>
221
+			<plugins>
222
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
223
+				<plugin>
224
+					<groupId>org.eclipse.m2e</groupId>
225
+					<artifactId>lifecycle-mapping</artifactId>
226
+					<version>1.0.0</version>
227
+					<configuration>
228
+						<lifecycleMappingMetadata>
229
+							<pluginExecutions>
230
+								<pluginExecution>
231
+									<pluginExecutionFilter>
232
+										<groupId>
233
+											org.codehaus.mojo
234
+										</groupId>
235
+										<artifactId>
236
+											exec-maven-plugin
237
+										</artifactId>
238
+										<versionRange>
239
+											[1.4.0,)
240
+										</versionRange>
241
+										<goals>
242
+											<goal>exec</goal>
243
+										</goals>
244
+									</pluginExecutionFilter>
245
+									<action>
246
+										<ignore />
247
+									</action>
248
+								</pluginExecution>
249
+							</pluginExecutions>
250
+						</lifecycleMappingMetadata>
251
+					</configuration>
252
+				</plugin>
253
+			</plugins>
254
+		</pluginManagement>
219 255
 	</build>
220 256
 
221 257
 </project>

Loading…
Cancel
Save