diff --git a/maven-embedder/src/test/projects/complex-project/maven-embedder/src/test/resources/pom-with-distribution-status.xml b/maven-embedder/src/test/projects/complex-project/maven-embedder/src/test/resources/settings/invalid-settings.xml
similarity index 75%
rename from maven-embedder/src/test/projects/complex-project/maven-embedder/src/test/resources/pom-with-distribution-status.xml
rename to maven-embedder/src/test/projects/complex-project/maven-embedder/src/test/resources/settings/invalid-settings.xml
index f3a55fa41a..a6e0ea9699 100644
--- a/maven-embedder/src/test/projects/complex-project/maven-embedder/src/test/resources/pom-with-distribution-status.xml
+++ b/maven-embedder/src/test/projects/complex-project/maven-embedder/src/test/resources/settings/invalid-settings.xml
@@ -1,30 +1,24 @@
-
-
-
-
-
- 4.0.0
- org.apache.maven
- test
- 1.0
-
- deployed
-
-
\ No newline at end of file
+
+
+
+
+
+ /Users/jvanzyl/maven-repo-local
diff --git a/maven-embedder/src/test/projects/complex-project/maven-embedder/src/test/resources/settings/valid-settings.xml b/maven-embedder/src/test/projects/complex-project/maven-embedder/src/test/resources/settings/valid-settings.xml
new file mode 100644
index 0000000000..fd5ff6aa8c
--- /dev/null
+++ b/maven-embedder/src/test/projects/complex-project/maven-embedder/src/test/resources/settings/valid-settings.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ /global/maven/local-repository
+
+ org.codehaus.tycho
+ org.sonatype.pwt
+
+
diff --git a/maven-embedder/src/test/projects/complex-project/pom.xml b/maven-embedder/src/test/projects/complex-project/pom.xml
new file mode 100644
index 0000000000..2d3a30ce3c
--- /dev/null
+++ b/maven-embedder/src/test/projects/complex-project/pom.xml
@@ -0,0 +1,260 @@
+
+
+
+ 4.0.0
+ test
+ maven
+ pom
+ Apache Maven
+ 2.1-SNAPSHOT
+ Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.
+ http://maven.apache.org/
+ 2001
+
+ jira
+ http://jira.codehaus.org/browse/MNG
+
+
+
+ Maven User List
+ users-subscribe@maven.apache.org
+ users-unsubscribe@maven.apache.org
+ users@maven.apache.org
+ http://mail-archives.apache.org/mod_mbox/maven-users
+
+ http://www.mail-archive.com/users@maven.apache.org/
+ http://www.nabble.com/Maven---Users-f178.html
+
+
+
+ Maven Developer List
+ dev-subscribe@maven.apache.org
+ dev-unsubscribe@maven.apache.org
+ dev@maven.apache.org
+ http://mail-archives.apache.org/mod_mbox/maven-dev
+
+
+ Maven Commits List
+ commits-subscribe@maven.apache.org
+ commits-unsubscribe@maven.apache.org
+ commits@maven.apache.org
+ http://mail-archives.apache.org/mod_mbox/maven-dev
+
+
+
+ scm:svn:http://svn.apache.org/repos/asf/maven/components/trunk
+ scm:svn:https://svn.apache.org/repos/asf/maven/components/trunk
+ http://svn.apache.org/viewcvs.cgi/maven/components/trunk
+
+
+
+
+
+ maven-release-plugin
+
+ https://svn.apache.org/repos/asf/maven/components/tags
+
+
+
+ org.codehaus.modello
+ modello-maven-plugin
+ 1.0-alpha-17
+
+
+ site-docs
+ pre-site
+
+ xdoc
+ xsd
+
+
+
+ standard
+
+ java
+ xpp3-reader
+ xpp3-writer
+
+
+
+
+
+
+
+
+ maven-surefire-plugin
+ 2.3
+
+
+
+
+ maven-build-context
+ maven-core
+ maven-lifecycle
+ maven-model
+ maven-plugin-api
+ maven-profile
+ maven-project
+ maven-reporting
+ maven-settings
+ maven-embedder
+
+
+ 1.0-alpha-30
+ 1.0-beta-2
+
+
+
+ junit
+ junit
+ 3.8.1
+ test
+
+
+
+
+
+ org.codehaus.plexus
+ plexus-container-default
+ ${plexusVersion}
+
+
+ org.codehaus.plexus
+ plexus-classworlds
+ 1.2-alpha-10
+
+
+ org.codehaus.plexus
+ plexus-utils
+ 1.4.5
+
+
+ org.apache.maven.wagon
+ wagon-provider-api
+ ${wagonVersion}
+
+
+ org.apache.maven.wagon
+ wagon-file
+ ${wagonVersion}
+
+
+ org.apache.maven.wagon
+ wagon-http-lightweight
+ ${wagonVersion}
+
+
+ org.apache.maven.wagon
+ wagon-ssh
+ ${wagonVersion}
+
+
+ org.apache.maven.wagon
+ wagon-ssh-external
+ ${wagonVersion}
+
+
+ org.apache.maven.artifact
+ maven-artifact
+ 3.0-SNAPSHOT
+
+
+ easymock
+ easymock
+ 1.2_Java1.3
+ test
+
+
+ jdom
+ jdom
+ 1.0
+
+
+
+
+
+ apache.website
+ scp://people.apache.org/www/maven.apache.org/ref/${project.version}/
+
+
+
+
+
+ osgi
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ 1.0.0
+
+
+
+ manifest
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 2.1
+
+
+ ${project.build.outputDirectory}/META-INF/MANIFEST.MF
+
+
+
+
+
+
+
+
+ release
+
+
+
+ maven-assembly-plugin
+ false
+
+
+ src/main/assembly/src.xml
+
+ gnu
+ maven-${project.version}-src
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
+
+
+
+
+
+
+