### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core.tests.model
Index: plugin.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/plugin.xml,v
retrieving revision 1.34
diff -u -r1.34 plugin.xml
--- plugin.xml	28 Apr 2009 17:46:14 -0000	1.34
+++ plugin.xml	22 Jul 2010 12:33:37 -0000
@@ -47,6 +47,12 @@
 			class="org.eclipse.jdt.core.tests.model.ContainerInitializer"/>
 	</extension>
 
+	<extension point = "org.eclipse.jdt.core.classpathContainerInitializer">
+		<classpathContainerInitializer
+			id="org.eclipse.jdt.core.tests.model.TEST_EXTERNAL_LIB_CONTAINER"
+			class="org.eclipse.jdt.core.tests.extensions.TestExternalLibContainerInitializer"/>
+	</extension>
+
 	<!-- Extra Java-like file extensions -->
 	<extension point="org.eclipse.core.contenttype.contentTypes"> 
 	    <file-association 
Index: src/org/eclipse/jdt/core/tests/extensions/TestExternalLibContainerInitializer.java
===================================================================
RCS file: src/org/eclipse/jdt/core/tests/extensions/TestExternalLibContainerInitializer.java
diff -N src/org/eclipse/jdt/core/tests/extensions/TestExternalLibContainerInitializer.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/jdt/core/tests/extensions/TestExternalLibContainerInitializer.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,46 @@
+package org.eclipse.jdt.core.tests.extensions;
+
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.ClasspathContainerInitializer;
+import org.eclipse.jdt.core.IClasspathContainer;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+
+public class TestExternalLibContainerInitializer extends ClasspathContainerInitializer {
+
+	IClasspathEntry[] entries;
+	
+	public void initialize(final IPath containerName, IJavaProject project)
+			throws CoreException {
+		IPath ws = ResourcesPlugin.getWorkspace().getRoot().getLocation();
+		final IPath containerPath = ws.append("../TestContainer/");
+		IClasspathContainer container = new IClasspathContainer() {
+			
+			public IPath getPath() {
+				return containerName;
+			}
+			
+			public int getKind() {
+				return IClasspathContainer.K_APPLICATION;
+			}
+			
+			public String getDescription() {
+				return "Test Container";
+			}
+			
+			public IClasspathEntry[] getClasspathEntries() {
+				if (TestExternalLibContainerInitializer.this.entries == null) {
+					TestExternalLibContainerInitializer.this.entries = new IClasspathEntry[] {
+							JavaCore.newLibraryEntry(containerPath, null, null)	
+						};
+				}
+				return TestExternalLibContainerInitializer.this.entries;
+			}
+		};
+		JavaCore.setClasspathContainer(containerName, new IJavaProject[]{ project}, new IClasspathContainer[] { container }, null);
+	}
+
+}
Index: src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java,v
retrieving revision 1.104
diff -u -r1.104 JavaProjectTests.java
--- src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java	28 Apr 2009 17:46:09 -0000	1.104
+++ src/org/eclipse/jdt/core/tests/model/JavaProjectTests.java	22 Jul 2010 12:33:42 -0000
@@ -35,6 +35,9 @@
 public JavaProjectTests(String name) {
 	super(name);
 }
+static {
+	TESTS_NAMES = new String[] { "testAddExternalLibFolder6" };
+}
 public static Test suite() {
 	TestSuite suite = (TestSuite) buildModelTestSuite(JavaProjectTests.class);
 
@@ -170,6 +173,38 @@
 }
 
 /*
+ * Ensures that a type from a classpath container pointing to an external folder can be resolved
+ */
+public void testAddExternalLibFolder6() throws CoreException, IOException {
+	try {
+		simulateExitRestart();
+
+		// create a class folder outside the testing workspace:
+		createExternalFolder("TestContainer/p");
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		File workspaceLocation = new File(workspace.getRoot().getLocation().toOSString());
+		File classFileSrc = new File(workspaceLocation, "JavaProjectLibTests/lib/p/Y.class");
+		File classFileDst = new File(workspaceLocation.getParentFile().getCanonicalFile(), "TestContainer/p/Y.class"); // canonicalize the external path as this is not done on case sensitive platforms when creating a new lib entry
+		copy(classFileSrc, classFileDst);
+
+		// setup a project depending on the classpath container:
+		IJavaProject javaProject = setUpJavaProject("ExternalContainer");
+		IProject p = javaProject.getProject();
+		
+		// build should find no errors:
+		p.build(IncrementalProjectBuilder.FULL_BUILD, null);
+		IMarker[] markers = p.findMarkers(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
+		for (int i=0; i<markers.length; i++)
+			System.out.println("unexpected marker: "+markers[i].getType()+": "+markers[i].getAttribute(IMarker.MESSAGE));
+		assertEquals("Unexpected markers", markers.length, 0);
+		
+	} finally {
+		deleteExternalResource("TestContainer");
+		deleteProject("ExternalContainer");
+	}
+}
+
+/*
  * Ensures that adding a library entry for an existing empty external ZIP archive updates the model
  */
 public void testAddZIPArchive1() throws Exception {
Index: workspace/ExternalContainer/.classpath
===================================================================
RCS file: workspace/ExternalContainer/.classpath
diff -N workspace/ExternalContainer/.classpath
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/ExternalContainer/.classpath	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.core.tests.model.TEST_EXTERNAL_LIB_CONTAINER"/>
+	<classpathentry kind="var" path="JCL_LIB"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: workspace/ExternalContainer/.project
===================================================================
RCS file: workspace/ExternalContainer/.project
diff -N workspace/ExternalContainer/.project
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/ExternalContainer/.project	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ExternalContainer</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
Index: workspace/ExternalContainer/src/p2/X.java
===================================================================
RCS file: workspace/ExternalContainer/src/p2/X.java
diff -N workspace/ExternalContainer/src/p2/X.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace/ExternalContainer/src/p2/X.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,5 @@
+package p2;
+import p.Y;
+public class X {
+    Y y;
+}