Author: baerrach
Date: Mon Sep 22 20:45:07 2008
New Revision: 698086
URL: http://svn.apache.org/viewvc?rev=698086&view=rev
Log:
[MECLIPSE-493] Automatically locate workspace
Eclispe Plugin
- workspace type changes from String to File
- getWorkspaceConfiguration() now locates the workspace if it is null.
ReadWorkspaceLocations
- exposed some constants needed outside of class
- getProjectLocation()
- now package scoped for unit testing
- rewrote internals to read in the URI string inside ".location" file
- now closes stream
- readArtefact() now takes projectLocation as File instead of String
- readAvailableJREs() returns null if no prefs file exists and a workspace was
located.
This causes the defaultJre to be used.
TempEclipseWorkspace
- added test fixtures used in TestCases.
- usePathToProject changed to which projects inside the workspace should be
linked in the metadata/
This value was only null to avoid re-initializing the internal workspaces,
which test fixtures resolves.
- Removed localizedIndicator as static test fixtures are configured once at
class load time and
regenerating these files each test run is not a large burden. However
misconfuration of the test files
and not regenerating was a source of errors during creation of extra ITs.
- Refactored out writeLocationFile()
- Deleted getWorkspaceLocation() as the variable is public.
AbstractEclipsePluginIT
- Added testProject( File basedir ) for ITs running inside the test eclipse
workspaces.
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/project-O/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/project-O/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/project-O/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/project-O/src/main/java/DummyClass.java
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/src/main/java/DummyClass.java
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/src/main/java/DummyClass.java
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/src/main/java/DummyClass.java
(with props)
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/project-O/src/main/java/DummyClass.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/project-O/src/main/java/DummyClass.java?rev=698086&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/project-O/src/main/java/DummyClass.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/project-O/src/main/java/DummyClass.java
Mon Sep 22 20:45:07 2008
@@ -0,0 +1,7 @@
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Trygve Laugstøl</a>
+ * @version $Id: DummyClass.java 698081 2008-09-23 03:33:22Z baerrach $
+ */
+public class DummyClass
+{
+}
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/project-O/src/main/java/DummyClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/src/main/java/DummyClass.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/src/main/java/DummyClass.java?rev=698086&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/src/main/java/DummyClass.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/src/main/java/DummyClass.java
Mon Sep 22 20:45:07 2008
@@ -0,0 +1,7 @@
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Trygve Laugstøl</a>
+ * @version $Id: DummyClass.java 698081 2008-09-23 03:33:22Z baerrach $
+ */
+public class DummyClass
+{
+}
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/src/main/java/DummyClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/src/main/java/DummyClass.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/src/main/java/DummyClass.java?rev=698086&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/src/main/java/DummyClass.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/src/main/java/DummyClass.java
Mon Sep 22 20:45:07 2008
@@ -0,0 +1,7 @@
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Trygve Laugstøl</a>
+ * @version $Id: DummyClass.java 698081 2008-09-23 03:33:22Z baerrach $
+ */
+public class DummyClass
+{
+}
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/src/main/java/DummyClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/src/main/java/DummyClass.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/src/main/java/DummyClass.java?rev=698086&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/src/main/java/DummyClass.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/src/main/java/DummyClass.java
Mon Sep 22 20:45:07 2008
@@ -0,0 +1,7 @@
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Trygve Laugstøl</a>
+ * @version $Id: DummyClass.java 698081 2008-09-23 03:33:22Z baerrach $
+ */
+public class DummyClass
+{
+}
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/src/main/java/DummyClass.java
------------------------------------------------------------------------------
svn:eol-style = native
