From 2e77cadb3ee141f700ca7292cf0ffe642df36150 Mon Sep 17 00:00:00 2001
From: Lorenzo Boccaccia <LORENZOB@ie.ibm.com>
Date: Thu, 21 Nov 2013 19:05:35 +0000
Subject: [PATCH] round of fixes to .settings

---
 .settings/org.eclipse.m2e.core.prefs          |  4 ++
 .../.project                                  |  0
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../category.xml                              |  1 +
 .../pom.xml                                   | 13 +++++-
 commons/.settings/org.eclipse.m2e.core.prefs  |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      |  2 +
 .../org.eclipse.ltk.core.refactoring.prefs    |  2 +
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          |  6 +++
 ....eclipse.wst.common.project.facet.core.xml |  5 +++
 .../.settings/org.eclipse.jdt.core.prefs      |  2 +
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          |  6 +++
 ....eclipse.wst.common.project.facet.core.xml |  5 +++
 .../.settings/org.eclipse.jdt.core.prefs      |  2 +
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          |  6 +++
 ....eclipse.wst.common.project.facet.core.xml |  5 +++
 deps/.settings/org.eclipse.m2e.core.prefs     |  4 ++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          |  3 +-
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../.settings/org.eclipse.jdt.core.prefs      |  8 ++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 10 +++++
 ....eclipse.wst.common.project.facet.core.xml |  7 ++++
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.validation.prefs          |  2 +
 domino.target                                 | 15 +++++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      | 11 +++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../com.ibm.sbt.libs.derby/build.properties   |  3 ++
 .../.settings/org.eclipse.jdt.core.prefs      | 11 +++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      | 11 +++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      |  6 +++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 pom.xml                                       | 10 ++++-
 samples/.settings/org.eclipse.m2e.core.prefs  |  4 ++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      |  2 +
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          |  5 +++
 ....eclipse.wst.common.project.facet.core.xml |  5 +++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../XPagesSBT/.settings/.jsdtscope            |  7 ++++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../j2ee/.settings/org.eclipse.m2e.core.prefs |  4 ++
 .../acme/.settings/org.eclipse.m2e.core.prefs |  4 ++
 .../acme.sample.webapp/.settings/.jsdtscope   | 12 ++++++
 .../.settings/org.eclipse.jdt.core.prefs      | 12 ++++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 19 +++++++++
 ....eclipse.wst.common.project.facet.core.xml |  9 +++++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../.settings/.jsdtscope                      | 12 ++++++
 .../.settings/org.eclipse.jdt.apt.core.prefs  |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      | 13 ++++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 11 +++++
 ....eclipse.wst.common.project.facet.core.xml |  9 +++++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 21 ++++++++++
 ....eclipse.wst.common.project.facet.core.xml |  4 ++
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../.settings/.jsdtscope                      | 12 ++++++
 .../.settings/org.eclipse.jdt.core.prefs      | 12 ++++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 19 +++++++++
 ....eclipse.wst.common.project.facet.core.xml |  9 +++++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      |  5 +++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      |  5 +++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../com.ibm.sbt.landing/.settings/.jsdtscope  | 12 ++++++
 .../.settings/org.eclipse.jdt.core.prefs      | 12 ++++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          |  8 ++++
 ....eclipse.wst.common.project.facet.core.xml |  9 +++++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 21 ++++++++++
 ....eclipse.wst.common.project.facet.core.xml |  5 +++
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../.settings/.jsdtscope                      | 12 ++++++
 .../.settings/org.eclipse.jdt.apt.core.prefs  |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      | 13 ++++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 17 ++++++++
 ....eclipse.wst.common.project.facet.core.xml |  9 +++++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../demosocial.webapp/.settings/.jsdtscope    | 13 ++++++
 .../.settings/org.eclipse.jdt.core.prefs      |  8 ++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 19 +++++++++
 ....eclipse.wst.common.project.facet.core.xml |  7 ++++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../grantaccess.webapp/.settings/.jsdtscope   | 12 ++++++
 .../.settings/org.eclipse.jdt.core.prefs      |  8 ++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 18 +++++++++
 ....eclipse.wst.common.project.facet.core.xml |  6 +++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../helloworld.webapp/.settings/.jsdtscope    | 12 ++++++
 .../.settings/org.eclipse.jdt.core.prefs      | 12 ++++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 17 ++++++++
 ....eclipse.wst.common.project.facet.core.xml |  9 +++++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../mysocial.webapp/.settings/.jsdtscope      | 12 ++++++
 .../.settings/org.eclipse.jdt.core.prefs      |  5 +++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 17 ++++++++
 ....eclipse.wst.common.project.facet.core.xml |  9 +++++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../smartcloud.webapp/.settings/.jsdtscope    | 12 ++++++
 .../org.eclipse.wst.common.component          | 18 +++++++++
 ....eclipse.wst.common.project.facet.core.xml |  7 ++++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../.settings/.jsdtscope                      | 12 ++++++
 .../.settings/org.eclipse.jdt.core.prefs      | 12 ++++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 17 ++++++++
 ....eclipse.wst.common.project.facet.core.xml |  9 +++++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 .../org.eclipse.wst.validation.prefs          |  2 +
 .../.settings/org.eclipse.jdt.core.prefs      |  8 ++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 20 ++++++++++
 ....eclipse.wst.common.project.facet.core.xml |  7 ++++
 .../org.eclipse.wst.validation.prefs          |  2 +
 sdk/.settings/org.eclipse.m2e.core.prefs      |  4 ++
 sdk/com.ibm.sbt.core.test/.classpath          |  1 -
 .../.settings/org.eclipse.jdt.core.prefs      |  7 ++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 ....eclipse.wst.common.project.facet.core.xml |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      |  2 +
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          |  7 ++++
 ....eclipse.wst.common.project.facet.core.xml |  5 +++
 .../.settings/org.eclipse.jdt.core.prefs      |  3 ++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.pde.core.prefs      |  2 +
 .../org.eclipse.wst.common.component          | 40 +++++++++----------
 .../org.eclipse.wst.common.component          | 20 ++++++++++
 ....eclipse.wst.common.project.facet.core.xml |  9 +++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.jdt.core.prefs      |  8 ++++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../org.eclipse.wst.common.component          | 20 ++++++++++
 ....eclipse.wst.common.project.facet.core.xml | 10 +++++
 xpages/.settings/org.eclipse.m2e.core.prefs   |  4 ++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 xpages/pom.xml                                |  1 -
 190 files changed, 1157 insertions(+), 29 deletions(-)
 create mode 100644 .settings/org.eclipse.m2e.core.prefs
 rename {xpages/com.ibm.sbt.target => com.ibm.sbt.p2}/.project (100%)
 create mode 100644 com.ibm.sbt.p2/.settings/org.eclipse.m2e.core.prefs
 rename {xpages/com.ibm.sbt.target => com.ibm.sbt.p2}/category.xml (54%)
 rename {xpages/com.ibm.sbt.target => com.ibm.sbt.p2}/pom.xml (63%)
 create mode 100644 commons/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 commons/com.ibm.commons.runtime/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 commons/com.ibm.commons.runtime/.settings/org.eclipse.ltk.core.refactoring.prefs
 create mode 100644 commons/com.ibm.commons.runtime/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 commons/com.ibm.commons.runtime/.settings/org.eclipse.wst.common.component
 create mode 100644 commons/com.ibm.commons.runtime/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 commons/com.ibm.commons.xml/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 commons/com.ibm.commons.xml/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 commons/com.ibm.commons.xml/.settings/org.eclipse.wst.common.component
 create mode 100644 commons/com.ibm.commons.xml/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 commons/com.ibm.commons/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 commons/com.ibm.commons/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 commons/com.ibm.commons/.settings/org.eclipse.wst.common.component
 create mode 100644 commons/com.ibm.commons/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 deps/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 deps/com.ibm.sbt.dojo180/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 deps/com.ibm.sbt.dojo180/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.common.component
 create mode 100644 deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 deps/com.ibm.sbt.jquery182/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 deps/com.ibm.sbt.jquery182/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 domino.target
 create mode 100644 libraries/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 libraries/com.ibm.sbt.libs.derby/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 libraries/com.ibm.sbt.libs.derby/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 libraries/com.ibm.sbt.libs.domino/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 libraries/com.ibm.sbt.libs.domino/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 libraries/com.ibm.sbt.libs.j2ee/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 libraries/com.ibm.sbt.libs.j2ee/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 libraries/com.ibm.sbt.libs/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 libraries/com.ibm.sbt.libs/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/domino/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/domino/com.ibm.sbt.domino.playground.feature/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/domino/com.ibm.sbt.domino.playground.updatesite/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/domino/com.ibm.xsp.sbtsdk.playground/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/domino/nsfsrc/nsf.playground/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/domino/nsfsrc/nsf.playground/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/.jsdtscope
 create mode 100644 samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/acme/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/acme/acme.sample.webapp/.settings/.jsdtscope
 create mode 100644 samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/acme/acme.social.sample.dataapp/.settings/.jsdtscope
 create mode 100644 samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.jdt.apt.core.prefs
 create mode 100644 samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/acme/acme.social.sample.webapp/.settings/.jsdtscope
 create mode 100644 samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/snippets/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.automation.core/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.automation.core/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.automation.test/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.automation.test/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.landing/.settings/.jsdtscope
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/.jsdtscope
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.jdt.apt.core.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/templates/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/templates/demosocial.webapp/.settings/.jsdtscope
 create mode 100644 samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/templates/grantaccess.webapp/.settings/.jsdtscope
 create mode 100644 samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/templates/helloworld.webapp/.settings/.jsdtscope
 create mode 100644 samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/templates/mysocial.webapp/.settings/.jsdtscope
 create mode 100644 samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/templates/smartcloud.webapp/.settings/.jsdtscope
 create mode 100644 samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/templates/social.helloworld.webapp/.settings/.jsdtscope
 create mode 100644 samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.component
 create mode 100644 samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.validation.prefs
 create mode 100644 sdk/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 sdk/com.ibm.sbt.core.test/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 sdk/com.ibm.sbt.core.test/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 sdk/com.ibm.sbt.core.test/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 sdk/com.ibm.sbt.core/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 sdk/com.ibm.sbt.core/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 sdk/com.ibm.sbt.core/.settings/org.eclipse.wst.common.component
 create mode 100644 sdk/com.ibm.sbt.core/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.pde.core.prefs
 create mode 100644 sdk/com.ibm.sbt.web/.settings/org.eclipse.wst.common.component
 create mode 100644 sdk/com.ibm.sbt.web/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 sdk/sbt.sso.webapp-archetype/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.wst.common.component
 create mode 100644 sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 xpages/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 xpages/com.ibm.sbt.domino.feature/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 xpages/com.ibm.sbt.domino.updatesite/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 xpages/com.ibm.xsp.sbtsdk/.settings/org.eclipse.m2e.core.prefs

diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/xpages/com.ibm.sbt.target/.project b/com.ibm.sbt.p2/.project
similarity index 100%
rename from xpages/com.ibm.sbt.target/.project
rename to com.ibm.sbt.p2/.project
diff --git a/com.ibm.sbt.p2/.settings/org.eclipse.m2e.core.prefs b/com.ibm.sbt.p2/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/com.ibm.sbt.p2/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/xpages/com.ibm.sbt.target/category.xml b/com.ibm.sbt.p2/category.xml
similarity index 54%
rename from xpages/com.ibm.sbt.target/category.xml
rename to com.ibm.sbt.p2/category.xml
index cf5ac1b417..673308a449 100644
--- a/xpages/com.ibm.sbt.target/category.xml
+++ b/com.ibm.sbt.p2/category.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
    <feature url="features/com.ibm.sbt.domino.feature_2.0.0.qualifier.jar" id="com.ibm.sbt.domino.feature" version="2.0.0.qualifier"/>
+   <feature url="features/com.ibm.sbt.domino.playground.feature_2.0.0.qualifier.jar" id="com.ibm.sbt.domino.playground.feature" version="2.0.0.qualifier"/>
 </site>
diff --git a/xpages/com.ibm.sbt.target/pom.xml b/com.ibm.sbt.p2/pom.xml
similarity index 63%
rename from xpages/com.ibm.sbt.target/pom.xml
rename to com.ibm.sbt.p2/pom.xml
index c89c27710b..32c8f04e9c 100644
--- a/xpages/com.ibm.sbt.target/pom.xml
+++ b/com.ibm.sbt.p2/pom.xml
@@ -2,9 +2,18 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>com.ibm.sbt</groupId>
-    <artifactId>com.ibm.sbt.xpages-libs</artifactId>
+    <artifactId>com.ibm.sbt</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>com.ibm.sbt.target</artifactId>
+  <artifactId>com.ibm.sbt.p2</artifactId>
   <packaging>eclipse-repository</packaging>
+  
+  	<repositories>
+		<repository>
+			<id>notes</id>
+			<layout>p2</layout>
+			<url>${notes-platform}</url>
+		</repository>
+	</repositories>
+  
 </project>
\ No newline at end of file
diff --git a/commons/.settings/org.eclipse.m2e.core.prefs b/commons/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/commons/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/commons/com.ibm.commons.runtime/.settings/org.eclipse.jdt.core.prefs b/commons/com.ibm.commons.runtime/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..8e3baab53e
--- /dev/null
+++ b/commons/com.ibm.commons.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
diff --git a/commons/com.ibm.commons.runtime/.settings/org.eclipse.ltk.core.refactoring.prefs b/commons/com.ibm.commons.runtime/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000000..b196c64a34
--- /dev/null
+++ b/commons/com.ibm.commons.runtime/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/commons/com.ibm.commons.runtime/.settings/org.eclipse.m2e.core.prefs b/commons/com.ibm.commons.runtime/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/commons/com.ibm.commons.runtime/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/commons/com.ibm.commons.runtime/.settings/org.eclipse.wst.common.component b/commons/com.ibm.commons.runtime/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..300168be8e
--- /dev/null
+++ b/commons/com.ibm.commons.runtime/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="com.ibm.commons.runtime">
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/.apt_generated"/>
+    </wb-module>
+</project-modules>
diff --git a/commons/com.ibm.commons.runtime/.settings/org.eclipse.wst.common.project.facet.core.xml b/commons/com.ibm.commons.runtime/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..c78d9323fe
--- /dev/null
+++ b/commons/com.ibm.commons.runtime/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/commons/com.ibm.commons.xml/.settings/org.eclipse.jdt.core.prefs b/commons/com.ibm.commons.xml/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..8e3baab53e
--- /dev/null
+++ b/commons/com.ibm.commons.xml/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
diff --git a/commons/com.ibm.commons.xml/.settings/org.eclipse.m2e.core.prefs b/commons/com.ibm.commons.xml/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/commons/com.ibm.commons.xml/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/commons/com.ibm.commons.xml/.settings/org.eclipse.wst.common.component b/commons/com.ibm.commons.xml/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..8be49c5c86
--- /dev/null
+++ b/commons/com.ibm.commons.xml/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="com.ibm.commons.xml">
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/.apt_generated"/>
+    </wb-module>
+</project-modules>
diff --git a/commons/com.ibm.commons.xml/.settings/org.eclipse.wst.common.project.facet.core.xml b/commons/com.ibm.commons.xml/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..c78d9323fe
--- /dev/null
+++ b/commons/com.ibm.commons.xml/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/commons/com.ibm.commons/.settings/org.eclipse.jdt.core.prefs b/commons/com.ibm.commons/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..8e3baab53e
--- /dev/null
+++ b/commons/com.ibm.commons/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
diff --git a/commons/com.ibm.commons/.settings/org.eclipse.m2e.core.prefs b/commons/com.ibm.commons/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/commons/com.ibm.commons/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/commons/com.ibm.commons/.settings/org.eclipse.wst.common.component b/commons/com.ibm.commons/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..28e3790cbf
--- /dev/null
+++ b/commons/com.ibm.commons/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="com.ibm.commons">
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/.apt_generated"/>
+    </wb-module>
+</project-modules>
diff --git a/commons/com.ibm.commons/.settings/org.eclipse.wst.common.project.facet.core.xml b/commons/com.ibm.commons/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..c78d9323fe
--- /dev/null
+++ b/commons/com.ibm.commons/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/deps/.settings/org.eclipse.m2e.core.prefs b/deps/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/deps/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.m2e.core.prefs b/deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.wst.common.component b/deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.wst.common.component
index a07998d328..075ee4730b 100644
--- a/deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.wst.common.component
+++ b/deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.wst.common.component
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="com.ibm.sbt.bootstrap211">
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <property name="context-root" value="sbt.bootstrap211"/>
-        <property name="java-output-path" value="/com.ibm.sbt.bootstrap211/WebContent/WEB-INF/classes"/>
+        <property name="java-output-path" value="/com.ibm.sbt.bootstrap211/target/classes"/>
     </wb-module>
 </project-modules>
diff --git a/deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.wst.validation.prefs b/deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/deps/com.ibm.sbt.bootstrap211/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.jdt.core.prefs b/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..69c31cd493
--- /dev/null
+++ b/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.m2e.core.prefs b/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.common.component b/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..8046cd4ce0
--- /dev/null
+++ b/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="sbt.dojo180">
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/.apt_generated"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <property name="context-root" value="sbt.dojo180"/>
+        <property name="java-output-path" value="/sbt.dojo180/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.common.project.facet.core.xml b/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..9f1491f6f6
--- /dev/null
+++ b/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.validation.prefs b/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/deps/com.ibm.sbt.dojo180/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/deps/com.ibm.sbt.jquery182/.settings/org.eclipse.m2e.core.prefs b/deps/com.ibm.sbt.jquery182/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/deps/com.ibm.sbt.jquery182/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/deps/com.ibm.sbt.jquery182/.settings/org.eclipse.wst.validation.prefs b/deps/com.ibm.sbt.jquery182/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/deps/com.ibm.sbt.jquery182/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/domino.target b/domino.target
new file mode 100644
index 0000000000..eaf85d14ab
--- /dev/null
+++ b/domino.target
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Domino Target Definition" sequenceNumber="17">
+<locations>
+<location path="${domino_install_path}\osgi\rcp\eclipse" type="Directory"/>
+<location path="${domino_install_path}\osgi\shared\eclipse" type="Directory"/>
+<location path="${domino_install_path}\osgi\social\eclipse" type="Directory"/>
+<location path="${eclipse_home}" type="Profile"/>
+</locations>
+<environment>
+<os>win32</os>
+<ws>win32</ws>
+<arch>x86</arch>
+<nl>en_US</nl>
+</environment>
+</target>
diff --git a/libraries/.settings/org.eclipse.m2e.core.prefs b/libraries/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/libraries/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/libraries/com.ibm.sbt.libs.derby/.settings/org.eclipse.jdt.core.prefs b/libraries/com.ibm.sbt.libs.derby/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..8000cd6ca6
--- /dev/null
+++ b/libraries/com.ibm.sbt.libs.derby/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/libraries/com.ibm.sbt.libs.derby/.settings/org.eclipse.m2e.core.prefs b/libraries/com.ibm.sbt.libs.derby/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/libraries/com.ibm.sbt.libs.derby/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/libraries/com.ibm.sbt.libs.derby/META-INF/MANIFEST.MF b/libraries/com.ibm.sbt.libs.derby/META-INF/MANIFEST.MF
index e869eacc8e..b540ded558 100644
--- a/libraries/com.ibm.sbt.libs.derby/META-INF/MANIFEST.MF
+++ b/libraries/com.ibm.sbt.libs.derby/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Derby Dependencies
 Bundle-SymbolicName: com.ibm.sbt.libs.derby
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: IBM
-Fragment-Host: com.ibm.sbt.libs;bundle-version="1.0.0"
+Fragment-Host: com.ibm.sbt.libs
 Bundle-ClassPath: lib/derby.jar,
  lib/derbyclient.jar,
  lib/derbytools.jar,
diff --git a/libraries/com.ibm.sbt.libs.derby/build.properties b/libraries/com.ibm.sbt.libs.derby/build.properties
index 92a9378063..87069dccd5 100644
--- a/libraries/com.ibm.sbt.libs.derby/build.properties
+++ b/libraries/com.ibm.sbt.libs.derby/build.properties
@@ -5,3 +5,6 @@ bin.includes = META-INF/,\
                lib/derby.jar,\
                lib/derbyclient.jar,\
                lib/derbytools.jar
+extra.1=lib/derby.jar
+extra.2=lib/derbyclient.jar
+extra.3=lib/derbytools.jar
diff --git a/libraries/com.ibm.sbt.libs.domino/.settings/org.eclipse.jdt.core.prefs b/libraries/com.ibm.sbt.libs.domino/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..8000cd6ca6
--- /dev/null
+++ b/libraries/com.ibm.sbt.libs.domino/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/libraries/com.ibm.sbt.libs.domino/.settings/org.eclipse.m2e.core.prefs b/libraries/com.ibm.sbt.libs.domino/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/libraries/com.ibm.sbt.libs.domino/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/libraries/com.ibm.sbt.libs.j2ee/.settings/org.eclipse.jdt.core.prefs b/libraries/com.ibm.sbt.libs.j2ee/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..8000cd6ca6
--- /dev/null
+++ b/libraries/com.ibm.sbt.libs.j2ee/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/libraries/com.ibm.sbt.libs.j2ee/.settings/org.eclipse.m2e.core.prefs b/libraries/com.ibm.sbt.libs.j2ee/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/libraries/com.ibm.sbt.libs.j2ee/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/libraries/com.ibm.sbt.libs/.settings/org.eclipse.jdt.core.prefs b/libraries/com.ibm.sbt.libs/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..1dae6b9aef
--- /dev/null
+++ b/libraries/com.ibm.sbt.libs/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
diff --git a/libraries/com.ibm.sbt.libs/.settings/org.eclipse.m2e.core.prefs b/libraries/com.ibm.sbt.libs/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/libraries/com.ibm.sbt.libs/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/pom.xml b/pom.xml
index 331dc9b797..cdb14093bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	<version>2.0.0-SNAPSHOT</version>
 
 	<properties>
-		<tycho-version>0.19.0</tycho-version>
+		<tycho-version>0.18.0</tycho-version>
 		<compiler>1.6</compiler>
 	</properties>
 
@@ -44,7 +44,15 @@
 				<module>assembly</module>
 
 				<module>xpages</module>
+				<module>com.ibm.sbt.p2</module>
 			</modules>
+			<repositories>
+				<repository>
+					<id>notes</id>
+					<layout>p2</layout>
+					<url>${notes-platform}</url>
+				</repository>
+			</repositories>
 		</profile>
 
 	</profiles>
diff --git a/samples/.settings/org.eclipse.m2e.core.prefs b/samples/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/domino/.settings/org.eclipse.m2e.core.prefs b/samples/domino/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/domino/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/domino/com.ibm.sbt.domino.playground.feature/.settings/org.eclipse.m2e.core.prefs b/samples/domino/com.ibm.sbt.domino.playground.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/domino/com.ibm.sbt.domino.playground.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/domino/com.ibm.sbt.domino.playground.updatesite/.settings/org.eclipse.m2e.core.prefs b/samples/domino/com.ibm.sbt.domino.playground.updatesite/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/domino/com.ibm.sbt.domino.playground.updatesite/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.jdt.core.prefs b/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..8e3baab53e
--- /dev/null
+++ b/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
diff --git a/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.m2e.core.prefs b/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.wst.common.component b/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..2ed4cfd6a9
--- /dev/null
+++ b/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="com.ibm.sbt.playground">
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..c78d9323fe
--- /dev/null
+++ b/samples/domino/com.ibm.sbt.playground/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/samples/domino/com.ibm.xsp.sbtsdk.playground/.settings/org.eclipse.m2e.core.prefs b/samples/domino/com.ibm.xsp.sbtsdk.playground/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/domino/com.ibm.xsp.sbtsdk.playground/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/domino/nsfsrc/nsf.playground/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/domino/nsfsrc/nsf.playground/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/domino/nsfsrc/nsf.playground/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/domino/nsfsrc/nsf.playground/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/domino/nsfsrc/nsf.playground/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/domino/nsfsrc/nsf.playground/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/.jsdtscope b/samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/.jsdtscope
new file mode 100644
index 0000000000..21384fea1e
--- /dev/null
+++ b/samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/.jsdtscope
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="Code/ScriptLibraries"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/domino/nsfsrc/nsf.socialenabler/XPagesSBT/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/acme/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/acme/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/acme/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/acme/acme.sample.webapp/.settings/.jsdtscope b/samples/j2ee/acme/acme.sample.webapp/.settings/.jsdtscope
new file mode 100644
index 0000000000..3a28de0c79
--- /dev/null
+++ b/samples/j2ee/acme/acme.sample.webapp/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..107056a36e
--- /dev/null
+++ b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..bb4f2a0893
--- /dev/null
+++ b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="acme.sample.webapp">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/.apt_generated"/>
+        <dependent-module archiveName="com.ibm.sbt.core-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="acme.sample.webapp"/>
+        <property name="java-output-path" value="/acme.sample.webapp/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..3d220cec12
--- /dev/null
+++ b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.web"/>
+  <fixed facet="java"/>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/acme/acme.sample.webapp/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/acme/acme.social.sample.dataapp/.settings/.jsdtscope b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/.jsdtscope
new file mode 100644
index 0000000000..3a28de0c79
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.jdt.apt.core.prefs b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000000..d67a8ba4d0
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,4 @@
+#Wed Oct 10 15:00:37 EDT 2012
+org.eclipse.jdt.apt.processorOptions/com.ibm.ws.ast.jws.annotations.processor.validateWSDL=on
+org.eclipse.jdt.apt.aptEnabled=true
+eclipse.preferences.version=1
diff --git a/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..66c3cd6f05
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,13 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.processAnnotations=enabled
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..6091640bde
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="acme.social.sample.dataapp">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/.apt_generated"/>
+        <property name="java-output-path" value="/acme.social.sample.dataapp/target/classes"/>
+        <property name="context-root" value="acme.social.sample.dataapp"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..ab80fc4e93
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.web"/>
+  <fixed facet="java"/>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="jst.web" version="2.5"/>
+</faceted-project>
diff --git a/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.dataapp/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.component b/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..3ecdb19f13
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="acme.social.sample-2.0.0-SNAPSHOT">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/ear-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/application" tag="defaultRootSource"/>
+        <dependent-module archiveName="acme.social.sample.dataapp-2.0.0-SNAPSHOT.war" deploy-path="/" handle="module:/resource/acme.social.sample.dataapp/acme.social.sample.dataapp">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="acme.social.sample.webapp-2.0.0-SNAPSHOT.war" deploy-path="/" handle="module:/resource/acme.social.sample.webapp/acme.social.sample.webapp">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="acme.sample.webapp-2.0.0-SNAPSHOT.war" deploy-path="/" handle="module:/resource/acme.sample.webapp/acme.sample.webapp">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.sbt.web-2.0.0-SNAPSHOT.war" deploy-path="/" handle="module:/resource/com.ibm.sbt.web/com.ibm.sbt.web">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="sbt.dojo180-2.0.0-SNAPSHOT.war" deploy-path="/" handle="module:/resource/com.ibm.sbt.dojo180/com.ibm.sbt.dojo180">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..606de26f0b
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="jst.ear" version="6.0"/>
+</faceted-project>
diff --git a/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.ear/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/acme/acme.social.sample.webapp/.settings/.jsdtscope b/samples/j2ee/acme/acme.social.sample.webapp/.settings/.jsdtscope
new file mode 100644
index 0000000000..3a28de0c79
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.webapp/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..107056a36e
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..447224d675
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="acme.social.sample.webapp">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp"/>
+        <dependent-module archiveName="com.ibm.sbt.core-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="acme.social.sample.webapp"/>
+        <property name="java-output-path" value="/acme.social.sample.webapp/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..ab80fc4e93
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.web"/>
+  <fixed facet="java"/>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="jst.web" version="2.5"/>
+</faceted-project>
diff --git a/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/acme/acme.social.sample.webapp/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/snippets/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/snippets/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/snippets/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/snippets/com.ibm.sbt.automation.core/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/snippets/com.ibm.sbt.automation.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..60105c1b95
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.automation.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/snippets/com.ibm.sbt.automation.core/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/snippets/com.ibm.sbt.automation.core/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.automation.core/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/snippets/com.ibm.sbt.automation.test/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/snippets/com.ibm.sbt.automation.test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..60105c1b95
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.automation.test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/snippets/com.ibm.sbt.automation.test/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/snippets/com.ibm.sbt.automation.test/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.automation.test/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/.jsdtscope b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/.jsdtscope
new file mode 100644
index 0000000000..3a28de0c79
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..107056a36e
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.common.component b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..b9f14e34c4
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="com.ibm.sbt.landing">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <property name="java-output-path" value="/com.ibm.sbt.landing/target/classes"/>
+        <property name="context-root" value="com.ibm.sbt.landing"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..d0b82a267c
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.web"/>
+  <fixed facet="wst.jsdt.web"/>
+  <fixed facet="java"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="jst.web" version="2.5"/>
+</faceted-project>
diff --git a/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.landing/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.component b/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..5f07283dcf
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="sbt.sample-2.0.0-SNAPSHOT">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/ear-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/application" tag="defaultRootSource"/>
+        <dependent-module archiveName="sbt.sample.web-2.0.0-SNAPSHOT.war" deploy-path="/" handle="module:/resource/com.ibm.sbt.sample.web/com.ibm.sbt.sample.web">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.sbt.web-2.0.0-SNAPSHOT.war" deploy-path="/" handle="module:/resource/com.ibm.sbt.web/com.ibm.sbt.web">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="sbt.dojo180-2.0.0-SNAPSHOT.war" deploy-path="/" handle="module:/resource/com.ibm.sbt.dojo180/com.ibm.sbt.dojo180">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="sbt.bootstrap211-2.0.0-SNAPSHOT.war" deploy-path="/" handle="module:/resource/com.ibm.sbt.bootstrap211/com.ibm.sbt.bootstrap211">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="sbt.jquery182-2.0.0-SNAPSHOT.war" deploy-path="/" handle="module:/resource/com.ibm.sbt.jquery182/com.ibm.sbt.jquery182">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..7a8af8a4bc
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.ear"/>
+  <installed facet="jst.ear" version="6.0"/>
+</faceted-project>
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.ear/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/.jsdtscope b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/.jsdtscope
new file mode 100644
index 0000000000..3a28de0c79
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.jdt.apt.core.prefs b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000000..6a26199f66
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,4 @@
+#Tue Jan 08 15:43:58 GMT 2013
+org.eclipse.jdt.apt.aptEnabled=true
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.reconcileEnabled=true
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..66c3cd6f05
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,13 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.processAnnotations=enabled
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.component b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..297cd182ff
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="com.ibm.sbt.sample.web">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <dependent-module archiveName="com.ibm.sbt.core-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="java-output-path" value="/com.ibm.sbt.sample.web/target/classes"/>
+        <property name="context-root" value="sbt.sample.web"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..88fdbc9000
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="java"/>
+  <fixed facet="jst.web"/>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+</faceted-project>
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/snippets/com.ibm.sbt.sample.web/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/templates/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/templates/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/templates/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/templates/demosocial.webapp/.settings/.jsdtscope b/samples/j2ee/templates/demosocial.webapp/.settings/.jsdtscope
new file mode 100644
index 0000000000..b72a6a47b2
--- /dev/null
+++ b/samples/j2ee/templates/demosocial.webapp/.settings/.jsdtscope
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/webapp"/>
+	<classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..69c31cd493
--- /dev/null
+++ b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..201e5d4557
--- /dev/null
+++ b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="demosocial.webapp">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <dependent-module archiveName="com.ibm.sbt.core-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="demosocial.webapp"/>
+        <property name="java-output-path" value="/demosocial.webapp/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..d8209d7f3d
--- /dev/null
+++ b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="1.6"/>
+</faceted-project>
diff --git a/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/templates/demosocial.webapp/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/templates/grantaccess.webapp/.settings/.jsdtscope b/samples/j2ee/templates/grantaccess.webapp/.settings/.jsdtscope
new file mode 100644
index 0000000000..3a28de0c79
--- /dev/null
+++ b/samples/j2ee/templates/grantaccess.webapp/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..69c31cd493
--- /dev/null
+++ b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..8972ec9d88
--- /dev/null
+++ b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="grantaccess.webapp">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <dependent-module archiveName="com.ibm.sbt.core-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="grantaccess.webapp"/>
+        <property name="java-output-path" value="/grantaccess.webapp/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..88f8d96e4c
--- /dev/null
+++ b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/templates/grantaccess.webapp/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/templates/helloworld.webapp/.settings/.jsdtscope b/samples/j2ee/templates/helloworld.webapp/.settings/.jsdtscope
new file mode 100644
index 0000000000..3a28de0c79
--- /dev/null
+++ b/samples/j2ee/templates/helloworld.webapp/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..107056a36e
--- /dev/null
+++ b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..5a3e59de65
--- /dev/null
+++ b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="helloworld.webapp">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <dependent-module archiveName="com.ibm.sbt.core-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="helloworld.webapp"/>
+        <property name="java-output-path" value="/helloworld.webapp/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..35975da471
--- /dev/null
+++ b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <fixed facet="jst.web"/>
+  <fixed facet="java"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/templates/helloworld.webapp/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/templates/mysocial.webapp/.settings/.jsdtscope b/samples/j2ee/templates/mysocial.webapp/.settings/.jsdtscope
new file mode 100644
index 0000000000..3a28de0c79
--- /dev/null
+++ b/samples/j2ee/templates/mysocial.webapp/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..60105c1b95
--- /dev/null
+++ b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..4d3f3cdc8c
--- /dev/null
+++ b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="mysocial.webapp">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <dependent-module archiveName="com.ibm.sbt.core-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="mysocial.webapp"/>
+        <property name="java-output-path" value="/mysocial.webapp/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..8c86255273
--- /dev/null
+++ b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <fixed facet="java"/>
+  <fixed facet="jst.web"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="1.6"/>
+</faceted-project>
diff --git a/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/templates/mysocial.webapp/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/templates/smartcloud.webapp/.settings/.jsdtscope b/samples/j2ee/templates/smartcloud.webapp/.settings/.jsdtscope
new file mode 100644
index 0000000000..3a28de0c79
--- /dev/null
+++ b/samples/j2ee/templates/smartcloud.webapp/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..48c5757c24
--- /dev/null
+++ b/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="smartcloud.webapp">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <dependent-module archiveName="com.ibm.sbt.core-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="smartcloud.webapp"/>
+        <property name="java-output-path" value="/smartcloud.webapp/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..9f1491f6f6
--- /dev/null
+++ b/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/j2ee/templates/smartcloud.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/templates/social.helloworld.webapp/.settings/.jsdtscope b/samples/j2ee/templates/social.helloworld.webapp/.settings/.jsdtscope
new file mode 100644
index 0000000000..3a28de0c79
--- /dev/null
+++ b/samples/j2ee/templates/social.helloworld.webapp/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..107056a36e
--- /dev/null
+++ b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..af7ddadc3b
--- /dev/null
+++ b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="social.helloworld.webapp">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <dependent-module archiveName="com.ibm.sbt.core-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="social.helloworld.webapp"/>
+        <property name="java-output-path" value="/social.helloworld.webapp/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..3d220cec12
--- /dev/null
+++ b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.web"/>
+  <fixed facet="java"/>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000000..3bd5d0a480
--- /dev/null
+++ b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000000..05bd71b6ec
--- /dev/null
+++ b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/templates/social.helloworld.webapp/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.jdt.core.prefs b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..69c31cd493
--- /dev/null
+++ b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.m2e.core.prefs b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.component b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..c99ec0e567
--- /dev/null
+++ b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="sso.sample.webapp">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <dependent-module archiveName="com.ibm.sbt.core-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.sbt.core/com.ibm.sbt.core">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.xml-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="sso.sample.webapp"/>
+        <property name="java-output-path" value="/sso.sample.webapp/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..9f1491f6f6
--- /dev/null
+++ b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.validation.prefs b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000000..04cad8cb75
--- /dev/null
+++ b/samples/j2ee/templates/sso.sample.webapp/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/sdk/.settings/org.eclipse.m2e.core.prefs b/sdk/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/sdk/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/sdk/com.ibm.sbt.core.test/.classpath b/sdk/com.ibm.sbt.core.test/.classpath
index 8bbd991f32..45c7750618 100644
--- a/sdk/com.ibm.sbt.core.test/.classpath
+++ b/sdk/com.ibm.sbt.core.test/.classpath
@@ -6,6 +6,5 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/sdk/com.ibm.sbt.core.test/.settings/org.eclipse.jdt.core.prefs b/sdk/com.ibm.sbt.core.test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..b4a95a8184
--- /dev/null
+++ b/sdk/com.ibm.sbt.core.test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
diff --git a/sdk/com.ibm.sbt.core.test/.settings/org.eclipse.m2e.core.prefs b/sdk/com.ibm.sbt.core.test/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/sdk/com.ibm.sbt.core.test/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/sdk/com.ibm.sbt.core.test/.settings/org.eclipse.wst.common.project.facet.core.xml b/sdk/com.ibm.sbt.core.test/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..bcfc325033
--- /dev/null
+++ b/sdk/com.ibm.sbt.core.test/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.6"/>
+</faceted-project>
diff --git a/sdk/com.ibm.sbt.core/.settings/org.eclipse.jdt.core.prefs b/sdk/com.ibm.sbt.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..8e3baab53e
--- /dev/null
+++ b/sdk/com.ibm.sbt.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
diff --git a/sdk/com.ibm.sbt.core/.settings/org.eclipse.m2e.core.prefs b/sdk/com.ibm.sbt.core/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/sdk/com.ibm.sbt.core/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/sdk/com.ibm.sbt.core/.settings/org.eclipse.wst.common.component b/sdk/com.ibm.sbt.core/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..858baa7793
--- /dev/null
+++ b/sdk/com.ibm.sbt.core/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="com.ibm.sbt.core">
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/" source-path="/.apt_generated"/>
+    </wb-module>
+</project-modules>
diff --git a/sdk/com.ibm.sbt.core/.settings/org.eclipse.wst.common.project.facet.core.xml b/sdk/com.ibm.sbt.core/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..c78d9323fe
--- /dev/null
+++ b/sdk/com.ibm.sbt.core/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.jdt.core.prefs b/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..28775d2fa5
--- /dev/null
+++ b/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
diff --git a/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.m2e.core.prefs b/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.pde.core.prefs b/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..ba582c22f4
--- /dev/null
+++ b/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,2 @@
+BUNDLE_ROOT_PATH=target/classes
+eclipse.preferences.version=1
diff --git a/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.wst.common.component b/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.wst.common.component
index 18e3b65330..0ae33fcfad 100644
--- a/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.wst.common.component
+++ b/sdk/com.ibm.sbt.proxy.web/.settings/org.eclipse.wst.common.component
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="com.ibm.sbt.proxy.web">
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/webapp"/>
-        <dependent-module archiveName="com.ibm.commons.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="com.ibm.commons.runtime.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="com.ibm.sbt.core.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.sbt.core/com.ibm.sbt.core">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="com.ibm.commons.xml.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="sbt.proxy"/>
-        <property name="java-output-path" value="/com.ibm.sbt.proxy.web/target/classes"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="com.ibm.sbt.proxy.web">
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+
+        <dependent-module archiveName="com.ibm.commons.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.sbt.core.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.sbt.core/com.ibm.sbt.core">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.xml.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="sbt.proxy"/>
+        <property name="java-output-path" value="/com.ibm.sbt.proxy.web/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/sdk/com.ibm.sbt.web/.settings/org.eclipse.wst.common.component b/sdk/com.ibm.sbt.web/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..4a2391850a
--- /dev/null
+++ b/sdk/com.ibm.sbt.web/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="com.ibm.sbt.web">
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <dependent-module archiveName="com.ibm.commons.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.sbt.core.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.sbt.core/com.ibm.sbt.core">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.xml.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="sbt"/>
+        <property name="java-output-path" value="/com.ibm.sbt.web/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/sdk/com.ibm.sbt.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/sdk/com.ibm.sbt.web/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..88fdbc9000
--- /dev/null
+++ b/sdk/com.ibm.sbt.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="java"/>
+  <fixed facet="jst.web"/>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+</faceted-project>
diff --git a/sdk/sbt.sso.webapp-archetype/.settings/org.eclipse.m2e.core.prefs b/sdk/sbt.sso.webapp-archetype/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/sdk/sbt.sso.webapp-archetype/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs b/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..69c31cd493
--- /dev/null
+++ b/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs b/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.wst.common.component b/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..c99ec0e567
--- /dev/null
+++ b/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="sso.sample.webapp">
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+        <dependent-module archiveName="com.ibm.sbt.core-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.sbt.core/com.ibm.sbt.core">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons/com.ibm.commons">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.runtime-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.runtime/com.ibm.commons.runtime">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="com.ibm.commons.xml-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/com.ibm.commons.xml/com.ibm.commons.xml">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="sso.sample.webapp"/>
+        <property name="java-output-path" value="/sso.sample.webapp/target/classes"/>
+    </wb-module>
+</project-modules>
diff --git a/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.wst.common.project.facet.core.xml b/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..b86028516f
--- /dev/null
+++ b/sdk/sbt.sso.webapp-archetype/src/main/resources/archetype-resources/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,10 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/xpages/.settings/org.eclipse.m2e.core.prefs b/xpages/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/xpages/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/xpages/com.ibm.sbt.domino.feature/.settings/org.eclipse.m2e.core.prefs b/xpages/com.ibm.sbt.domino.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/xpages/com.ibm.sbt.domino.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/xpages/com.ibm.sbt.domino.updatesite/.settings/org.eclipse.m2e.core.prefs b/xpages/com.ibm.sbt.domino.updatesite/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/xpages/com.ibm.sbt.domino.updatesite/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/xpages/com.ibm.xsp.sbtsdk/.settings/org.eclipse.m2e.core.prefs b/xpages/com.ibm.xsp.sbtsdk/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/xpages/com.ibm.xsp.sbtsdk/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/xpages/pom.xml b/xpages/pom.xml
index 84da0b82d7..1357e33aad 100644
--- a/xpages/pom.xml
+++ b/xpages/pom.xml
@@ -22,7 +22,6 @@
 	<modules>
 		<module>com.ibm.sbt.domino.feature</module>
 		<module>com.ibm.sbt.domino.updatesite</module>
-		<module>com.ibm.sbt.target</module>
 		<module>com.ibm.xsp.sbtsdk</module>
 	</modules>