Author: aheritier
Date: Mon Jan 28 12:05:22 2008
New Revision: 616014
URL: http://svn.apache.org/viewvc?rev=616014&view=rev
Log:
MECLIPSE-344 : connecting existing workspace artifact-projects
Patch submitted by Richard van Nieuwenhoven
Add missing files
Added:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/.project
(with props)
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/pom.xml
(with props)
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/.project
(with props)
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/pom.xml
(with props)
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.server.core.prefs
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/.project
(with props)
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/pom.xml
(with props)
Modified:
maven/plugins/branches/MECLIPSE-344/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
Modified:
maven/plugins/branches/MECLIPSE-344/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-344/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java?rev=616014&r1=616013&r2=616014&view=diff
==============================================================================
---
maven/plugins/branches/MECLIPSE-344/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
(original)
+++
maven/plugins/branches/MECLIPSE-344/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
Mon Jan 28 12:05:22 2008
@@ -373,7 +373,7 @@
}
catch ( Exception e )
{
- logger.error( "Could not read workspace wtp server runtimes
preferences", e );
+ logger.error( "Could not read workspace wtp server runtimes
preferences : " + e.getMessage() );
}
if ( runtimesElement != null )
Added:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/.project?rev=616014&view=auto
==============================================================================
---
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/.project
(added)
+++
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/.project
Mon Jan 28 12:05:22 2008
@@ -0,0 +1,9 @@
+<projectDescription>
+ <name>direct-compile</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/.project
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/pom.xml?rev=616014&view=auto
==============================================================================
---
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/pom.xml
(added)
+++
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/pom.xml
Mon Jan 28 12:05:22 2008
@@ -0,0 +1,35 @@
+<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>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-compile</artifactId>
+ <version>1.0</version>
+ <distributionManagement>
+ <status>verified</status>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-test</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-provided</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-optional</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault13/workspace/direct-compile/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/.project?rev=616014&view=auto
==============================================================================
---
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/.project
(added)
+++
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/.project
Mon Jan 28 12:05:22 2008
@@ -0,0 +1,9 @@
+<projectDescription>
+ <name>direct-compile</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/.project
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/pom.xml?rev=616014&view=auto
==============================================================================
---
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/pom.xml
(added)
+++
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/pom.xml
Mon Jan 28 12:05:22 2008
@@ -0,0 +1,35 @@
+<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>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-compile</artifactId>
+ <version>1.0</version>
+ <distributionManagement>
+ <status>verified</status>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-test</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-provided</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-optional</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/eclipseWithDefault15/workspace/direct-compile/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.server.core.prefs
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.server.core.prefs?rev=616014&view=auto
==============================================================================
---
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.server.core.prefs
(added)
+++
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.server.core.prefs
Mon Jan 28 12:05:22 2008
@@ -0,0 +1,4 @@
+#Thu Dec 20 10:12:38 CET 2007
+module-start-timeout=300000
+runtimes=<?xml version\="1.0" encoding\="UTF-8"?>\n<runtimes>\n <runtime
id\="was.express.v51" id-set\="true"
location\="/opt/IBM2/SDP70/runtimes/express_v51_stub" locked\="true"
name\="WebSphere Application Server v5.1 Express stub"
runtime-type-id\="com.ibm.etools.websphere.runtime.v51.express" stub\="true"
test-environment\="false" timestamp\="0"/>\n <runtime id\="was.base.v51"
id-set\="true" location\="/opt/IBM2/SDP70/runtimes/base_v51_stub"
locked\="true" name\="WebSphere Application Server v5.1 stub"
runtime-type-id\="com.ibm.etools.websphere.runtime.v51.base" stub\="true"
test-environment\="false" timestamp\="0"/>\n <runtime id\="was.base.v6"
id-set\="true" location\="/opt/IBM2/SDP70/runtimes/base_v6_stub" locked\="true"
name\="WebSphere Application Server v6.0 stub"
runtime-type-id\="com.ibm.ws.ast.st.runtime.v60" stub\="true"
test-environment\="false" timestamp\="0"/>\n <runtime id\="was.base.v61"
id-set\="true" location\="/opt/IBM2/SDP70/runtimes/base_v61_stub"
locked\="true" name\="WebSphere Application Server v6.1 stub"
runtime-type-id\="com.ibm.ws.ast.st.runtime.v61" stub\="true"
test-environment\="false" timestamp\="0"/>\n <runtime id\="JBoss v4.0"
location\="/home/nir/Desktop/jboss-4.2.1.GA/jboss-4.2.1.GA/bin" name\="JBoss
v4.0" runtime-type-id\="org.eclipse.jst.server.generic.runtime.jboss4"
server_definition_id\="org.eclipse.jst.server.generic.runtime.jboss4"
timestamp\="0">\n <map key\="generic_server_instance_properties"
serverRootDirectory\="/home/nir/Desktop/jboss-4.2.1.GA/jboss-4.2.1.GA"/>\n
</runtime>\n</runtimes>\n
+eclipse.preferences.version=1
Added:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/.project?rev=616014&view=auto
==============================================================================
---
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/.project
(added)
+++
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/.project
Mon Jan 28 12:05:22 2008
@@ -0,0 +1,9 @@
+<projectDescription>
+ <name>direct-compile</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/.project
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/pom.xml?rev=616014&view=auto
==============================================================================
---
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/pom.xml
(added)
+++
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/pom.xml
Mon Jan 28 12:05:22 2008
@@ -0,0 +1,35 @@
+<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>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-compile</artifactId>
+ <version>1.0</version>
+ <distributionManagement>
+ <status>verified</status>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-test</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-provided</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>deps-direct-optional</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/MECLIPSE-344/src/test/resources/eclipse/rad7WithDefault14/workspace/direct-compile/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
