Author: baerrach
Date: Mon Oct 17 05:08:00 2011
New Revision: 1185004
URL: http://svn.apache.org/viewvc?rev=1185004&view=rev
Log:
[MECLIPSE-642]
Added integration test project-65-MECLIPSE-642
Replaced all uses of .replace( '\\', '/' ) with IdeUtils.fixSeparator()
Replaced all uses of someString.substring( baseDir.length() ) with
IdeUtils.toRelativeAndFixSeparator()
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.classpath
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/java/DummyClass.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/resources/local_resource.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/pom.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/s/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/s/short_resource_folder_name.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/shared-resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/shared-resources/global_resource.txt
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt?rev=1185004&r1=1185003&r2=1185004&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/README-testing.txt Mon Oct 17
05:08:00 2011
@@ -11,6 +11,23 @@ Testing maven-eclipse-plugin
One day these tests will be unified into whatever "sanctioned" way of doing
integration tests becomes.
+Running a single test
+* Comment out the TestCase file
+ For the test case you want to run, you need to manually comment out *ALL*
the other tests.
+ e.g.
+ in EclipsePluginIT if you want to run just "testProject65" you need to
comment out
+ everything but that one method.
+
+* Run mvn and tell surefire to only run your TestCase file
+
+ (See
http://maven.apache.org/plugins/maven-surefire-plugin/examples/single-test.html
for more details)
+
+ mvn -Prun-its -Dtest=EclipsePluginIT verify
+
+* Dont forget to undo this prior to committing
+
+ You probably wont, since the file will have a massive change set, but you
have been warned.
+
PluginTestTool
The bulk of the integration tests are using the old (and obsoleted) method
of PluginTestTool.
These IT tests are invoked via maven-failsafe-plugin:integration-test which
looks for JUnit test cases
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=1185004&r1=1185003&r2=1185004&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
Mon Oct 17 05:08:00 2011
@@ -535,8 +535,7 @@ public class EclipseClasspathWriter
{
// NB eclipse (3.1) doesn't support variables in javadoc
paths, so we need to add the
// full path for the maven repo
- javadocpath =
- StringUtils.replace( IdeUtils.getCanonicalPath(
dep.getJavadocAttachment() ), "\\", "/" ); //$NON-NLS-1$ //$NON-NLS-2$
+ javadocpath = IdeUtils.fixSeparator(
IdeUtils.getCanonicalPath( dep.getJavadocAttachment() ) );
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java?rev=1185004&r1=1185003&r2=1185004&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
Mon Oct 17 05:08:00 2011
@@ -296,8 +296,8 @@ public class EclipseProjectWriter
&& !dep.isTestDependency() && !dep.isOsgiBundle() )
{
String name = dep.getFile().getName();
- addLink( writer, name, StringUtils.replace(
IdeUtils.getCanonicalPath( dep.getFile() ), "\\",
- "/" ),
LINK_TYPE_FILE );
+ addLink( writer, name, IdeUtils.fixSeparator(
IdeUtils.getCanonicalPath( dep.getFile() ) ),
+ LINK_TYPE_FILE );
}
}
}
@@ -316,7 +316,7 @@ public class EclipseProjectWriter
if ( file.isFile() )
{
String name = IdeUtils.toRelativeAndFixSeparator( projectBaseDir,
file, true );
- String location = IdeUtils.getCanonicalPath( file ).replaceAll(
"\\\\", "/" ); //$NON-NLS-1$ //$NON-NLS-2$
+ String location = IdeUtils.fixSeparator(
IdeUtils.getCanonicalPath( file ) );
addLink( writer, name, location, LINK_TYPE_FILE );
}
@@ -337,7 +337,7 @@ public class EclipseProjectWriter
if ( sourceRoot.isDirectory() )
{
String name = IdeUtils.toRelativeAndFixSeparator(
projectBaseDir, sourceRoot, true );
- String location = IdeUtils.getCanonicalPath( sourceRoot
).replaceAll( "\\\\", "/" ); //$NON-NLS-1$ //$NON-NLS-2$
+ String location = IdeUtils.fixSeparator(
IdeUtils.getCanonicalPath( sourceRoot ) );
addLink( writer, name, location, LINK_TYPE_DIRECTORY );
}
@@ -355,7 +355,7 @@ public class EclipseProjectWriter
if ( resourceDir.isDirectory() )
{
String name = IdeUtils.toRelativeAndFixSeparator(
projectBaseDir, resourceDir, true );
- String location = IdeUtils.getCanonicalPath( resourceDir
).replaceAll( "\\\\", "/" ); //$NON-NLS-1$ //$NON-NLS-2$
+ String location = IdeUtils.fixSeparator(
IdeUtils.getCanonicalPath( resourceDir ) );
addLink( writer, name, location, LINK_TYPE_DIRECTORY );
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java?rev=1185004&r1=1185003&r2=1185004&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
Mon Oct 17 05:08:00 2011
@@ -13,9 +13,9 @@ import java.util.Map;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.eclipse.writers.AbstractEclipseWriter;
+import org.apache.maven.plugin.ide.IdeUtils;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import org.codehaus.plexus.util.xml.XMLWriter;
@@ -92,21 +92,19 @@ public class MyEclipseSpringBeansWriter
// maven's cwd stays at the top of hierarchical projects so we
// do this with full path so it works as we descend through various
modules (projects)
- String absolutePrefix = config.getEclipseProjectDirectory() + "/";
- // convert hem all to forward slashes
- absolutePrefix = StringUtils.replace( absolutePrefix, "\\", "/" );
- int absolutePrefixLength = absolutePrefix.length();
+ File basedir = config.getEclipseProjectDirectory();
Iterator onConfigFiles =
- getConfigurationFilesList( absolutePrefix + (String)
springConfig.get( "basedir" ),
+ getConfigurationFilesList( new File( basedir, (String)
springConfig.get( "basedir" ) ),
(String) springConfig.get(
"file-pattern" ) ).iterator();
while ( onConfigFiles.hasNext() )
{
+ String onConfigFileName = (String) onConfigFiles.next();
+ File onConfigFile = new File( onConfigFileName );
+ String relativeFileName = IdeUtils.toRelativeAndFixSeparator(
basedir, onConfigFile, false );
+
writer.startElement( MYECLIPSE_SPRING_CONFIG );
- // convert out any back slashes
- String processedFileName = StringUtils.replace( (String)
onConfigFiles.next(), "\\", "/" );
- // write out the file name minus the absolute path to get to the
top of the project
- writer.writeText( processedFileName.substring(
absolutePrefixLength ) );
+ writer.writeText( relativeFileName );
writer.endElement();
}
writer.endElement();
@@ -133,17 +131,16 @@ public class MyEclipseSpringBeansWriter
* @param pattern file include pattern
* @return the list of filenames matching the given pattern
*/
- private Collection getConfigurationFilesList( String basedir, String
pattern )
+ private Collection getConfigurationFilesList( File basedir, String pattern
)
{
ArrayList configFiles = new ArrayList();
try
{
- File directory = new File( basedir );
- if ( directory.exists() )
+ if ( basedir.exists() )
{
log.debug( "Scanning " + basedir + " for spring definition
files" );
- File[] subdirs = directory.listFiles( new FileFilter()
+ File[] subdirs = basedir.listFiles( new FileFilter()
{
public boolean accept( File pathname )
{
@@ -155,11 +152,11 @@ public class MyEclipseSpringBeansWriter
{
for ( int i = 0; i < subdirs.length; i++ )
{
- configFiles.addAll( getConfigurationFilesList(
subdirs[i].getPath(), pattern ) );
+ configFiles.addAll( getConfigurationFilesList(
subdirs[i], pattern ) );
}
}
- configFiles.addAll( FileUtils.getFileNames( directory,
pattern, null, true ) );
+ configFiles.addAll( FileUtils.getFileNames( basedir, pattern,
null, true ) );
}
else
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java?rev=1185004&r1=1185003&r2=1185004&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseSettingsWriter.java
Mon Oct 17 05:08:00 2011
@@ -75,7 +75,7 @@ public class EclipseSettingsWriter
if ( encoding != null )
{
- String basedir =
config.getProject().getBasedir().getAbsolutePath();
+ File basedir = config.getProject().getBasedir();
List compileSourceRoots =
config.getProject().getCompileSourceRoots();
if ( compileSourceRoots != null )
{
@@ -83,7 +83,7 @@ public class EclipseSettingsWriter
while ( it.hasNext() )
{
String sourcePath = (String) it.next();
- String relativePath =
sourcePath.substring( basedir.length() ).replace( '\\', '/' );
+ String relativePath = IdeUtils.toRelativeAndFixSeparator(
basedir, new File( sourcePath ), false );
coreSettings.put(
PROP_JDT_CORE_COMPILER_ENCODING + relativePath, encoding );
}
}
@@ -94,7 +94,7 @@ public class EclipseSettingsWriter
while ( it.hasNext() )
{
String sourcePath = (String) it.next();
- String relativePath =
sourcePath.substring( basedir.length() ).replace( '\\', '/' );
+ String relativePath = IdeUtils.toRelativeAndFixSeparator(
basedir, new File( sourcePath ), false );
coreSettings.put(
PROP_JDT_CORE_COMPILER_ENCODING + relativePath, encoding );
}
}
@@ -105,7 +105,8 @@ public class EclipseSettingsWriter
while ( it.hasNext() )
{
Resource resource = (Resource)
it.next();
- String relativePath =
resource.getDirectory().substring( basedir.length() ).replace( '\\', '/' );
+ String relativePath =
+ IdeUtils.toRelativeAndFixSeparator( basedir, new File(
resource.getDirectory() ), false );
coreSettings.put(
PROP_JDT_CORE_COMPILER_ENCODING + relativePath, encoding );
}
}
@@ -116,7 +117,8 @@ public class EclipseSettingsWriter
while ( it.hasNext() )
{
Resource resource = (Resource)
it.next();
- String relativePath =
resource.getDirectory().substring( basedir.length() ).replace( '\\', '/' );
+ String relativePath =
+ IdeUtils.toRelativeAndFixSeparator( basedir, new File(
resource.getDirectory() ), false );
coreSettings.put(
PROP_JDT_CORE_COMPILER_ENCODING + relativePath, encoding );
}
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java?rev=1185004&r1=1185003&r2=1185004&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
Mon Oct 17 05:08:00 2011
@@ -760,6 +760,17 @@ public class EclipsePluginIT
{
testProject( "project-64-MECLIPSE-388" );
}
+
+ /**
+ * [MECLIPSE-642] Releative resource directories cause
StringIndexOutOfBoundsException
+ *
+ * @throws Exception
+ */
+ public void testProject65()
+ throws Exception
+ {
+ testProject( "project-65-MECLIPSE-642" );
+ }
public void testGroovy()
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java?rev=1185004&r1=1185003&r2=1185004&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseWorkspaceIT.java
Mon Oct 17 05:08:00 2011
@@ -19,6 +19,7 @@ import java.io.FileInputStream;
import java.util.Properties;
import
org.apache.maven.plugin.eclipse.writers.workspace.EclipseWorkspaceWriter;
+import org.apache.maven.plugin.ide.IdeUtils;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
@@ -92,12 +93,13 @@ public class EclipseWorkspaceIT
assertNotNull( "Test M2_REPO has a value", M2_REPO );
- String localRepo = new File( PlexusTestCase.getBasedir(),
"target/test-classes/m2repo" ).getCanonicalPath();
-
+ String expectectLocalRepo =
+ new File( PlexusTestCase.getBasedir(),
"target/test-classes/m2repo" ).getCanonicalPath();
// comparing repo's all in lower case because windows is case
insensitive and settings.xml may have
// a repository specified with different case
- assertEquals( "Test M2_REPO value", localRepo.replace( '\\', '/'
).toLowerCase(),
- M2_REPO.replace( '\\', '/' ).toLowerCase() );
+ expectectLocalRepo = IdeUtils.fixSeparator( expectectLocalRepo
).toLowerCase();
+ String actualLocalRepo = IdeUtils.fixSeparator( M2_REPO
).toLowerCase();
+ assertEquals( "Test M2_REPO value", expectectLocalRepo,
actualLocalRepo );
}
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.classpath?rev=1185004&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.classpath
Mon Oct 17 05:08:00 2011
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src"
path="${basedir}/target/test-classes/projects/project-65-MECLIPSE-642/shared-resources"
excluding="**/*.java"/>
+ <classpathentry kind="src"
path="${basedir}/target/test-classes/projects/project-65-MECLIPSE-642/s"
excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.project?rev=1185004&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.project
Mon Oct 17 05:08:00 2011
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>module-1</name>
+ <comment>Test that relative resource references work. NO_M2ECLIPSE_SUPPORT:
Project files created with the maven-eclipse-plugin are not supported in
M2Eclipse.</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.project
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.jdt.core.prefs?rev=1185004&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.jdt.core.prefs
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.jdt.core.prefs
Mon Oct 17 05:08:00 2011
@@ -0,0 +1,5 @@
+#Mon Oct 17 09:47:02 CST 2011
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.component
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.component?rev=1185004&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.component
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.component
Mon Oct 17 05:08:00 2011
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="module-1">
+ <property name="context-root" value="contextName"/>
+ <wb-resource deploy-path="/" source-path="src/main/webapp"/>
+ <property name="java-output-path" value="/target/classes"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="src/main/resources"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="${basedir}/target/test-classes/projects/project-65-MECLIPSE-642/shared-resources"/>
+ <wb-resource deploy-path="/WEB-INF/classes"
source-path="${basedir}/target/test-classes/projects/project-65-MECLIPSE-642/s"/>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?rev=1185004&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
Mon Oct 17 05:08:00 2011
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.web"/>
+ <installed facet="jst.web" version="2.4"/>
+ <installed facet="jst.java" version="5.0"/>
+</faceted-project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/expected/.settings/org.eclipse.wst.common.project.facet.core.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml?rev=1185004&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml
Mon Oct 17 05:08:00 2011
@@ -0,0 +1,47 @@
+<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>
+ <parent>
+ <groupId>eclipse.project65</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+ <groupId>eclipse.project65</groupId>
+ <artifactId>module-1</artifactId>
+ <version>1</version>
+ <packaging>war</packaging>
+ <name>War Project</name>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>../shared-resources</directory>
+ </resource>
+ <!-- The original bug is because resource.getDirectory().substring(
basedir.length() ) So we need a resource directory that is shorter than
basedir. It's been re-implemented to use IdeUtils anyway, but include the check
-->
+ <resource>
+ <directory>../s</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+ <workspace>${basedir}/../../eclipse/workspaceDoesNotExist</workspace>
+ <wtpversion>1.5</wtpversion>
+ <wtpContextName>contextName</wtpContextName>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <!-- make sure this plugin can handle explicitly set
warSoruceDirectory in reactor mode -->
+ <warSourceDirectory>src/main/webapp</warSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/java/DummyClass.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/java/DummyClass.txt?rev=1185004&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/java/DummyClass.txt
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/java/DummyClass.txt
Mon Oct 17 05:08:00 2011
@@ -0,0 +1,7 @@
+/**
+ * @author <a href="mailto:[email protected]";>Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public class DummyClass
+{
+}
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/resources/local_resource.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/resources/local_resource.txt?rev=1185004&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/resources/local_resource.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/src/main/resources/local_resource.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/pom.xml?rev=1185004&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/pom.xml
Mon Oct 17 05:08:00 2011
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <packaging>pom</packaging>
+ <groupId>eclipse.project65</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <name>Test MECLIPSE-642</name>
+ <description>Test that relative resource references work</description>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+
<workspace>${basedir}/../../eclipse/workspaceDoesNotExist</workspace>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <modules>
+ <module>module-1</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/s/short_resource_folder_name.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/s/short_resource_folder_name.txt?rev=1185004&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/s/short_resource_folder_name.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/s/short_resource_folder_name.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/shared-resources/global_resource.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/shared-resources/global_resource.txt?rev=1185004&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/shared-resources/global_resource.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/shared-resources/global_resource.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
