diff --git a/basic-wiring/README b/basic-wiring/README
new file mode 100644
index 0000000..2b77a02
--- /dev/null
+++ b/basic-wiring/README
@@ -0,0 +1,31 @@
+Simple wiring example base project.
+
+Part 1 - Imports/Exports
+========================
+
+1. Install the bundles into Equinox. Start bundle.x, it will wire to bundle.y2 for its dependencies.
+
+Part 2 - Attributes
+========================
+
+1. Add an attribute to the import of 'p' in bundle.x
+2. Show the failed resolve
+3. Add the matching attribute to the export of 'p' in bundle.y1
+4. Show the mixed bundle resolve
+
+Part 3 - Mandatory Attributes
+=============================
+
+1. Add a mandatory attribute to the export 'q' in 'bundle.y2'
+2. Show how bundle.x cannot wire to it
+3. Now match that attribute in bundle.x
+
+Part 4 - Uses
+==============================
+
+1. Install bundle.z
+2. Add import of 'r' into bundle.x
+3. Show how bundle.x is wired to bundle.z for 'r'
+4. Show wiring of bundle.z
+5. Now, change the version of the 'p' import in bundle.x to [1.2.4,-)
+6. Show how this cannot resolve
\ No newline at end of file
diff --git a/basic-wiring/bundle.x/.classpath b/basic-wiring/bundle.x/.classpath
new file mode 100644
index 0000000..4f0fdbe
--- /dev/null
+++ b/basic-wiring/bundle.x/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/basic-wiring/bundle.x/.project b/basic-wiring/bundle.x/.project
new file mode 100644
index 0000000..bc788fd
--- /dev/null
+++ b/basic-wiring/bundle.x/.project
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>bundle.x</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/basic-wiring/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml b/basic-wiring/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..31a5903
--- /dev/null
+++ b/basic-wiring/bundle.x/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="SpringSource dm Server (Runtime) v2.0"/>
+  <installed facet="com.springsource.server.bundle" version="1.0"/>
+</faceted-project>
diff --git a/basic-wiring/bundle.x/src/main/resources/META-INF/MANIFEST.MF b/basic-wiring/bundle.x/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7bee035
--- /dev/null
+++ b/basic-wiring/bundle.x/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1
+Bundle-ManifestVersion: 2
+Bundle-Name: X Bundle
+Bundle-SymbolicName: bundle.x
+Bundle-Version: 1.0
+Import-Package: p;version="1.2.3",q;version="[1.2, 1.3)"
+
diff --git a/basic-wiring/bundle.y1/.classpath b/basic-wiring/bundle.y1/.classpath
new file mode 100644
index 0000000..4f0fdbe
--- /dev/null
+++ b/basic-wiring/bundle.y1/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/basic-wiring/bundle.y1/.project b/basic-wiring/bundle.y1/.project
new file mode 100644
index 0000000..9758595
--- /dev/null
+++ b/basic-wiring/bundle.y1/.project
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>bundle.y1</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/basic-wiring/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml b/basic-wiring/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..31a5903
--- /dev/null
+++ b/basic-wiring/bundle.y1/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="SpringSource dm Server (Runtime) v2.0"/>
+  <installed facet="com.springsource.server.bundle" version="1.0"/>
+</faceted-project>
diff --git a/basic-wiring/bundle.y1/src/main/resources/META-INF/MANIFEST.MF b/basic-wiring/bundle.y1/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..bfa48fe
--- /dev/null
+++ b/basic-wiring/bundle.y1/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1
+Bundle-ManifestVersion: 2
+Bundle-Name: Y Bundle
+Bundle-SymbolicName: bundle.y
+Bundle-Version: 1.0
+Export-Package: p;version="1.2.3",q;version="1.2.4"
diff --git a/basic-wiring/bundle.y2/.classpath b/basic-wiring/bundle.y2/.classpath
new file mode 100644
index 0000000..4f0fdbe
--- /dev/null
+++ b/basic-wiring/bundle.y2/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/basic-wiring/bundle.y2/.project b/basic-wiring/bundle.y2/.project
new file mode 100644
index 0000000..4761c53
--- /dev/null
+++ b/basic-wiring/bundle.y2/.project
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>bundle.y2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/basic-wiring/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml b/basic-wiring/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..31a5903
--- /dev/null
+++ b/basic-wiring/bundle.y2/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="SpringSource dm Server (Runtime) v2.0"/>
+  <installed facet="com.springsource.server.bundle" version="1.0"/>
+</faceted-project>
diff --git a/basic-wiring/bundle.y2/src/main/resources/META-INF/MANIFEST.MF b/basic-wiring/bundle.y2/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9a81dda
--- /dev/null
+++ b/basic-wiring/bundle.y2/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1
+Bundle-ManifestVersion: 2
+Bundle-Name: Y Bundle
+Bundle-SymbolicName: bundle.y
+Bundle-Version: 1.1
+Export-Package: p;version="1.2.4",q;version="1.2.5"
diff --git a/basic-wiring/bundle.z/.classpath b/basic-wiring/bundle.z/.classpath
new file mode 100644
index 0000000..4f0fdbe
--- /dev/null
+++ b/basic-wiring/bundle.z/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/basic-wiring/bundle.z/.project b/basic-wiring/bundle.z/.project
new file mode 100644
index 0000000..bb5c5fc
--- /dev/null
+++ b/basic-wiring/bundle.z/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>bundle.z</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>
diff --git a/basic-wiring/bundle.z/src/main/resources/META-INF/MANIFEST.MF b/basic-wiring/bundle.z/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..189ce9c
--- /dev/null
+++ b/basic-wiring/bundle.z/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1
+Bundle-ManifestVersion: 2
+Bundle-Name: Z Bundle
+Bundle-SymbolicName: bundle.z
+Bundle-Version: 1.0
+Export-Package: r;version="1.0";uses:="p"
+Import-Package: p;version="[1.2.3, 1.2.4)"
diff --git a/basic-wiring/commands b/basic-wiring/commands
new file mode 100644
index 0000000..bcdf946
--- /dev/null
+++ b/basic-wiring/commands
@@ -0,0 +1,4 @@
+install file:bundle.x/target/classes
+install file:bundle.y1/target/classes
+install file:bundle.y2/target/classes
+install file:bundle.z/target/classes
diff --git a/org.eclipse.osgi-3.5.0.v20090311-1300.jar b/org.eclipse.osgi-3.5.0.v20090311-1300.jar
new file mode 100644
index 0000000..593f0bc
--- /dev/null
+++ b/org.eclipse.osgi-3.5.0.v20090311-1300.jar
Binary files differ