Merge branch 'merge-kernel-master'
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..61eaf49
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+.gradle
+bin/
+build/
+.classpath
+.project
+.settings/
+.idea/
+
diff --git a/BUILD.md b/BUILD.md
new file mode 100644
index 0000000..b1dcf6d
--- /dev/null
+++ b/BUILD.md
@@ -0,0 +1,88 @@
+How to build Virgo locally
+==========================
+
+Getting the Code
+----------------
+
+The Virgo source code is managed with Git and hosted at the Eclipse Foundation.
+All Virgo related repositories are listed [here](https://wiki.eclipse.org/Virgo/Source#Virgo_git_Repositories).
+
+    $ git clone git://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.root.git virgo
+    $ cd virgo
+    $ git submodule update --init
+
+For the impatient
+-----------------
+
+Since 3.7.0.M02 Virgo is built with [Gradle](https://gradle.org/).
+
+Running the default tasks with `./gradlew` will
+* compile the Virgo sources
+* create a temporary p2 repository
+* and package the Virgo deliverables.
+
+Build the Virgo deliverables
+============================
+
+To build distributable zipped files run:
+
+    $ ./gradlew clean jar build distZip fullDistZip rapDistZip
+
+There is an additional task to install the zips, too. This comes quite handy to quickly check the distributables:
+
+    $ ./gradlew installDist installFullDist installRapDist
+
+To speed up local builds you can skip some time-consuming processes like follows:
+ * `-Dskip.normalize.bundles=true`
+ * `-Dskip.local.signing=true`
+ * `-Dskip.compress.bundles=true`
+
+If you are only interested in the distribution(s) you might additionally want to skip some Gradle tasks, too: `-x test -x findBugsMain -x findBugsTest`.
+
+A simple local build can be done using the following command:
+
+    $ ./gradlew -Dskip.normalize.bundles=true -Dskip.local.signing=true -Dskip.compress.bundles=true clean jar build distZip fullDistZip -x test
+
+Run the basic smoke tests
+=========================
+
+TBD
+
+Upload a p2 update site
+=======================
+
+You can upload the create p2 update site with `./gradlew uploadUpdateSite`. This will
+* normalize, compress and sign
+* then upload the bundles into a composite repository at eclipse.org.
+
+Please review the configuration located in `org.eclipse.virgo.updatesite/gradle.properties`. You can test your setup with `./gradlew testEclipseConnection`:
+
+```
+$ ./gradlew testEclipseConnection
+...
+:org.eclipse.virgo.site:testEclipseConnection
+eclipseDotOrg|Linux build 3.0.101-0.47.52-default #1 SMP Thu Mar 26 10:55:49 UTC 2015 (0e3c7c8) x86_64 x86_64 x86_64 GNU/Linux
+Linux build 3.0.101-0.47.52-default #1 SMP Thu Mar 26 10:55:49 UTC 2015 (0e3c7c8) x86_64 x86_64 x86_64 GNU/Linux
+
+BUILD SUCCESSFUL
+
+Total time: 12.935 secs
+```
+
+Once the configuration is successfully tested you can do the actual upload of a snapshot site with `./gradlew uploadUpdateSite`.
+
+```
+$ ./gradlew -Dci.build=true clean uploadUpdateSite
+...
+:org.eclipse.virgo.site:copyBundles
+:org.eclipse.virgo.site:normalizeBundles
+:org.eclipse.virgo.site:signBundles
+...
+:org.eclipse.virgo.site:compressBundles
+:org.eclipse.virgo.site:createP2Repository
+Generating metadata for ..
+Generation completed with success [3 seconds].
+Generating metadata for ..
+Generation completed with success [0 seconds].
+> Building 99% > :org.eclipse.virgo.site:uploadUpdateSite
+```
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..e3a5790
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,47 @@
+Contributing to Virgo
+=====================
+
+Thanks for your interest in this project.
+
+Project description:
+--------------------
+
+The Virgo Web Server from EclipseRT is a completely module-based Java application server that is designed to run enterprise Java applications and Spring-powered applications with a high degree of flexibility and reliability. It offers a simple yet comprehensive platform to develop, deploy, and service enterprise Java applications.
+The Virgo kernel supports the core concepts of Virgo and is not biased towards the web server, thus enabling other types of server to be created. The kernel can also be used stand-alone as a rich OSGi application platform. A server runtime can easily be constructed by deploying suitable bundles on top of the kernel.
+
+- https://projects.eclipse.org/projects/rt.virgo
+
+Developer resources:
+--------------------
+
+Information regarding source code management, builds, coding standards, and more.
+
+- https://projects.eclipse.org/projects/rt.virgo/developer
+
+Contributor License Agreement:
+------------------------------
+
+Before your contribution can be accepted by the project, you need to create and electronically sign the Eclipse Foundation Contributor License Agreement (CLA).
+
+- http://www.eclipse.org/legal/CLA.php
+
+Contact:
+--------
+
+Contact the project developers via the project's "dev" list.
+
+- https://dev.eclipse.org/mailman/listinfo/virgo-dev
+
+Search for bugs:
+----------------
+
+This project uses Bugzilla to track ongoing development and issues.
+
+- https://bugs.eclipse.org/bugs/buglist.cgi?product=Virgo
+
+Create a new bug:
+-----------------
+
+Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
+
+- https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Virgo
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a4c1d75
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+### Building Virgo
+
+     ./gradlew clean assemble managementConsole distZip installDist
+
diff --git a/apps/.gitignore b/apps/.gitignore
new file mode 100644
index 0000000..3fbb103
--- /dev/null
+++ b/apps/.gitignore
@@ -0,0 +1,13 @@
+*/src/main/resources/META-INF/MANIFEST.MF
+*/src/test/resources/META-INF/TEST.MF
+target
+integration-repo
+ivy-cache
+.ant-targets-build.xml
+user-ivy.properties
+bin/
+build/
+.settings/
+.project
+.classpath
+
diff --git a/apps/CONTRIBUTING.md b/apps/CONTRIBUTING.md
new file mode 100644
index 0000000..e3a5790
--- /dev/null
+++ b/apps/CONTRIBUTING.md
@@ -0,0 +1,47 @@
+Contributing to Virgo
+=====================
+
+Thanks for your interest in this project.
+
+Project description:
+--------------------
+
+The Virgo Web Server from EclipseRT is a completely module-based Java application server that is designed to run enterprise Java applications and Spring-powered applications with a high degree of flexibility and reliability. It offers a simple yet comprehensive platform to develop, deploy, and service enterprise Java applications.
+The Virgo kernel supports the core concepts of Virgo and is not biased towards the web server, thus enabling other types of server to be created. The kernel can also be used stand-alone as a rich OSGi application platform. A server runtime can easily be constructed by deploying suitable bundles on top of the kernel.
+
+- https://projects.eclipse.org/projects/rt.virgo
+
+Developer resources:
+--------------------
+
+Information regarding source code management, builds, coding standards, and more.
+
+- https://projects.eclipse.org/projects/rt.virgo/developer
+
+Contributor License Agreement:
+------------------------------
+
+Before your contribution can be accepted by the project, you need to create and electronically sign the Eclipse Foundation Contributor License Agreement (CLA).
+
+- http://www.eclipse.org/legal/CLA.php
+
+Contact:
+--------
+
+Contact the project developers via the project's "dev" list.
+
+- https://dev.eclipse.org/mailman/listinfo/virgo-dev
+
+Search for bugs:
+----------------
+
+This project uses Bugzilla to track ongoing development and issues.
+
+- https://bugs.eclipse.org/bugs/buglist.cgi?product=Virgo
+
+Create a new bug:
+-----------------
+
+Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
+
+- https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Virgo
\ No newline at end of file
diff --git a/apps/build.gradle b/apps/build.gradle
new file mode 100644
index 0000000..3ce2378
--- /dev/null
+++ b/apps/build.gradle
@@ -0,0 +1,51 @@
+
+project(':apps:org.eclipse.virgo.apps.repository.core') {
+    dependencies {
+        testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+		testCompile project(':medic:org.eclipse.virgo.medic.test')
+
+        compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
+
+        compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+
+        compile group: "org.eclipse.gemini", name: "org.eclipse.gemini.web.core", version: geminiWebVersion, configuration: "compile", ext: "jar"
+
+		compile project(':util:org.eclipse.virgo.util.math')
+		compile project(':util:org.eclipse.virgo.util.io')
+		compile project(':util:org.eclipse.virgo.util.jmx')
+		compile project(':util:org.eclipse.virgo.util.osgi.manifest')
+		compile project(':medic:org.eclipse.virgo.medic')
+		compile project(':repository:org.eclipse.virgo.repository')
+		compile project(':kernel:org.eclipse.virgo.kernel.services')
+
+        if (System.properties['weaving.enabled'] == 'true') {
+            aspectpath project(':medic:org.eclipse.virgo.medic')
+            aspectpath project(':util:org.eclipse.virgo.util.jmx')
+        }
+	}
+}
+
+project(':apps:org.eclipse.virgo.apps.repository.web') {
+    dependencies {
+		testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+        testCompile group: "org.eclipse.virgo.mirrored", name: "org.springframework.test", version: springframeworkVersion,ext: "jar"
+
+        compile group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "compile", ext: "jar"
+
+        compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion,ext: "jar"
+        compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
+        compile group: "org.eclipse.virgo.mirrored", name: "org.springframework.web", version: springframeworkVersion, ext: "jar"
+
+		compile project(':util:org.eclipse.virgo.util.io')
+		compile project(':apps:org.eclipse.virgo.apps.repository.core')
+	}
+}
+
+project(':apps:org.eclipse.virgo.apps.splash') {
+    dependencies {
+        compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
+        compile group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "compile", ext: "jar"
+
+		compile project(':apps:org.eclipse.virgo.apps.repository.core')
+	}
+}
diff --git a/apps/java-server.profile b/apps/java-server.profile
new file mode 100644
index 0000000..453a56f
--- /dev/null
+++ b/apps/java-server.profile
@@ -0,0 +1,211 @@
+org.osgi.framework.system.packages = \
+ javax.accessibility,\
+ javax.activation,\
+ javax.activation;version="1.1.0",\
+ javax.activity,\
+ javax.annotation,\
+ javax.annotation;version="1.0.0",\
+ javax.annotation.processing,\
+ javax.crypto,\
+ javax.crypto.interfaces,\
+ javax.crypto.spec,\
+ javax.imageio,\
+ javax.imageio.event,\
+ javax.imageio.metadata,\
+ javax.imageio.plugins.bmp,\
+ javax.imageio.plugins.jpeg,\
+ javax.imageio.spi,\
+ javax.imageio.stream,\
+ javax.jws,\
+ javax.jws;version="2.0",\
+ javax.jws.soap,\
+ javax.jws.soap;version="2.0",\
+ javax.lang.model,\
+ javax.lang.model.element,\
+ javax.lang.model.type,\
+ javax.lang.model.util,\
+ javax.management,\
+ javax.management.loading,\
+ javax.management.modelmbean,\
+ javax.management.monitor,\
+ javax.management.openmbean,\
+ javax.management.relation,\
+ javax.management.remote,\
+ javax.management.remote.rmi,\
+ javax.management.timer,\
+ javax.naming,\
+ javax.naming.directory,\
+ javax.naming.event,\
+ javax.naming.ldap,\
+ javax.naming.spi,\
+ javax.net,\
+ javax.net.ssl,\
+ javax.print,\
+ javax.print.attribute,\
+ javax.print.attribute.standard,\
+ javax.print.event,\
+ javax.rmi,\
+ javax.rmi.CORBA,\
+ javax.rmi.ssl,\
+ javax.script,\
+ javax.script;version="1.1",\
+ javax.security.auth,\
+ javax.security.auth.callback,\
+ javax.security.auth.kerberos,\
+ javax.security.auth.login,\
+ javax.security.auth.spi,\
+ javax.security.auth.x500,\
+ javax.security.cert,\
+ javax.security.sasl,\
+ javax.sound.midi,\
+ javax.sound.midi.spi,\
+ javax.sound.sampled,\
+ javax.sound.sampled.spi,\
+ javax.sql,\
+ javax.sql.rowset,\
+ javax.sql.rowset.serial,\
+ javax.sql.rowset.spi,\
+ javax.swing,\
+ javax.swing.border,\
+ javax.swing.colorchooser,\
+ javax.swing.event,\
+ javax.swing.filechooser,\
+ javax.swing.plaf,\
+ javax.swing.plaf.basic,\
+ javax.swing.plaf.metal,\
+ javax.swing.plaf.multi,\
+ javax.swing.plaf.synth,\
+ javax.swing.table,\
+ javax.swing.text,\
+ javax.swing.text.html,\
+ javax.swing.text.html.parser,\
+ javax.swing.text.rtf,\
+ javax.swing.tree,\
+ javax.swing.undo,\
+ javax.tools,\
+ javax.transaction,\
+ javax.transaction;version="1.0.1",\
+ javax.transaction;version="1.1.0",\
+ javax.transaction.xa,\
+ javax.transaction.xa;version="1.0.1",\
+ javax.transaction.xa;version="1.1.0",\
+ javax.xml,\
+ javax.xml;version="1.0.1",\
+ javax.xml.bind,\
+ javax.xml.bind;version="2.0",\
+ javax.xml.bind.annotation,\
+ javax.xml.bind.annotation;version="2.0",\
+ javax.xml.bind.annotation.adapters,\
+ javax.xml.bind.annotation.adapters;version="2.0",\
+ javax.xml.bind.attachment,\
+ javax.xml.bind.attachment;version="2.0",\
+ javax.xml.bind.helpers,\
+ javax.xml.bind.helpers;version="2.0",\
+ javax.xml.bind.util,\
+ javax.xml.bind.util;version="2.0",\
+ javax.xml.crypto,\
+ javax.xml.crypto;version="1.0",\
+ javax.xml.crypto.dom,\
+ javax.xml.crypto.dom;version="1.0",\
+ javax.xml.crypto.dsig,\
+ javax.xml.crypto.dsig;version="1.0",\
+ javax.xml.crypto.dsig.dom,\
+ javax.xml.crypto.dsig.dom;version="1.0",\
+ javax.xml.crypto.dsig.keyinfo,\
+ javax.xml.crypto.dsig.keyinfo;version="1.0",\
+ javax.xml.crypto.dsig.spec,\
+ javax.xml.crypto.dsig.spec;version="1.0",\
+ javax.xml.datatype,\
+ javax.xml.namespace,\
+ javax.xml.parsers,\
+ javax.xml.soap,\
+ javax.xml.soap;version="1.3.0",\
+ javax.xml.stream,\
+ javax.xml.stream;version="1.0.1",\
+ javax.xml.stream.events,\
+ javax.xml.stream.events;version="1.0.1",\
+ javax.xml.stream.util,\
+ javax.xml.stream.util;version="1.0.1",\
+ javax.xml.transform,\
+ javax.xml.transform.dom,\
+ javax.xml.transform.sax,\
+ javax.xml.transform.stax,\
+ javax.xml.transform.stream,\
+ javax.xml.validation,\
+ javax.xml.ws,\
+ javax.xml.ws;version="2.1.1",\
+ javax.xml.ws.handler,\
+ javax.xml.ws.handler;version="2.1.1",\
+ javax.xml.ws.handler.soap,\
+ javax.xml.ws.handler.soap;version="2.1.1",\
+ javax.xml.ws.http,\
+ javax.xml.ws.http;version="2.1.1",\
+ javax.xml.ws.soap,\
+ javax.xml.ws.soap;version="2.1.1",\
+ javax.xml.ws.spi,\
+ javax.xml.ws.spi;version="2.1.1",\
+ javax.xml.xpath,\
+ org.eclipse.virgo.kernel.equinox.extensions;version="3.7.0",\
+ org.eclipse.virgo.kernel.equinox.extensions.hooks;version="3.7.0",\
+ org.eclipse.virgo.test.launcher;version="3.7.0",\
+ org.eclipse.virgo.util.launcher.parser;version="3.7.0",\
+ org.ietf.jgss,\
+ org.omg.CORBA,\
+ org.omg.CORBA_2_3,\
+ org.omg.CORBA_2_3.portable,\
+ org.omg.CORBA.DynAnyPackage,\
+ org.omg.CORBA.ORBPackage,\
+ org.omg.CORBA.portable,\
+ org.omg.CORBA.TypeCodePackage,\
+ org.omg.CosNaming,\
+ org.omg.CosNaming.NamingContextExtPackage,\
+ org.omg.CosNaming.NamingContextPackage,\
+ org.omg.Dynamic,\
+ org.omg.DynamicAny,\
+ org.omg.DynamicAny.DynAnyFactoryPackage,\
+ org.omg.DynamicAny.DynAnyPackage,\
+ org.omg.IOP,\
+ org.omg.IOP.CodecFactoryPackage,\
+ org.omg.IOP.CodecPackage,\
+ org.omg.Messaging,\
+ org.omg.PortableInterceptor,\
+ org.omg.PortableInterceptor.ORBInitInfoPackage,\
+ org.omg.PortableServer,\
+ org.omg.PortableServer.CurrentPackage,\
+ org.omg.PortableServer.POAManagerPackage,\
+ org.omg.PortableServer.POAPackage,\
+ org.omg.PortableServer.portable,\
+ org.omg.PortableServer.ServantLocatorPackage,\
+ org.omg.SendingContext,\
+ org.omg.stub.java.rmi,\
+ org.w3c.dom,\
+ org.w3c.dom.bootstrap,\
+ org.w3c.dom.css,\
+ org.w3c.dom.events,\
+ org.w3c.dom.html,\
+ org.w3c.dom.ls,\
+ org.w3c.dom.ranges,\
+ org.w3c.dom.stylesheets,\
+ org.w3c.dom.traversal,\
+ org.w3c.dom.views ,\
+ org.xml.sax,\
+ org.xml.sax.ext,\
+ org.xml.sax.helpers
+org.osgi.framework.bootdelegation = \
+ com_cenqua_clover,\
+ com.cenqua.*,\
+ com.yourkit.*,\
+ com.sun.*,\
+ javax.xml.*,\
+ org.apache.xerces.jaxp.*,\
+ org.w3c.*,\
+ org.xml.*,\
+ sun.*
+org.osgi.framework.executionenvironment = \
+ OSGi/Minimum-1.0,\
+ OSGi/Minimum-1.1,\
+ J2SE-1.3,\
+ J2SE-1.4,\
+ J2SE-1.5,\
+ JavaSE-1.6
+osgi.java.profile.name = Virgo-Web-Server-Java6
diff --git a/apps/org.eclipse.virgo.apps.repository.core/.springBeans b/apps/org.eclipse.virgo.apps.repository.core/.springBeans
new file mode 100644
index 0000000..975966a
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/.springBeans
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.2.2.RELEASE]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+		<config>src/main/resources/META-INF/spring/hosted-repository-context.xml</config>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/HostedRepositoryInfo.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/HostedRepositoryInfo.java
new file mode 100644
index 0000000..ebe42d8
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/HostedRepositoryInfo.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core;
+
+import javax.management.MXBean;
+
+/**
+ * A management interface for a hosted repository; 
+ * exposes information specific to the hosted repository and references underlying repository.
+ * <p />
+ *
+ * <strong>Concurrent Semantics</strong><br />
+ * Implementations must be thread-safe.
+ *
+ */
+@MXBean
+public interface HostedRepositoryInfo {
+
+    /**
+     * @return the hosted repository's Uri prefix
+     */
+    String getUriPrefix();
+    
+    /**
+     * @return the name of the local repository being hosted
+     */
+    String getLocalRepositoryName();
+
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/RepositoryIndex.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/RepositoryIndex.java
new file mode 100644
index 0000000..c2a8d25
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/RepositoryIndex.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+
+/**
+ * A <code>RepositoryIndex</code> represents the index of a hosted repository.
+ * 
+ * <p />
+ *
+ * <strong>Concurrent Semantics</strong><br />
+ * Implementations <strong>must</strong> be thread-safe.
+ *
+ */
+public interface RepositoryIndex {
+
+    /**
+     * Return the length of the index in bytes.
+     * 
+     * @return the index's length in bytes.
+     */
+    int getLength();
+    
+    /**
+     * Returns the index's entity tag
+     * 
+     * @return the entity tag
+     */
+    String getETag();
+    
+    /**
+     * Returns an {@link InputStream} from which the index can be read
+     * 
+     * @return an <code>InputStream</code> for the index
+     * @throws IOException 
+     */
+    InputStream getInputStream() throws IOException;
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/RepositoryManager.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/RepositoryManager.java
new file mode 100644
index 0000000..7a7bb29
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/RepositoryManager.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * A <code>RepositoryManager</code> manages repositories, providing access to repository indices and artifacts.
+ * 
+ * <p />
+ * 
+ * <strong>Concurrent Semantics</strong><br />
+ * 
+ * Implementations <strong>must</strong> be thread-safe.
+ * 
+ */
+public interface RepositoryManager {
+
+    /**
+     * Returns the {@link RepositoryIndex} of the repository identified by the supplied repository name.
+     * 
+     * @param repositoryName The name of the repository for which the index is required
+     * 
+     * @return The named repository's index, or <code>null</code> if a repository with the supplied name is not known.
+     * @throws IOException if index cannot be accessed
+     */
+    RepositoryIndex getIndex(String repositoryName) throws IOException;
+
+    /**
+     * Returns an <code>InputStream</code> from which the artifact, stored in the repository identified by the supplied
+     * repository name, and identified by the supplied type, name, and version, can be read.
+     * 
+     * @param repositoryName The name of the repository that holds the required artifact
+     * @param type The type of the required artifact
+     * @param name The name of the required artifact
+     * @param version The version of the required artifact
+     * 
+     * @return The requested artifact, or <code>null</code> if the artifact does not exist.
+     */
+    InputStream getArtifact(String repositoryName, String type, String name, String version);
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/ExportableIndexFilePool.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/ExportableIndexFilePool.java
new file mode 100644
index 0000000..991e8b9
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/ExportableIndexFilePool.java
@@ -0,0 +1,243 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.virgo.util.io.FileSystemUtils;
+
+/**
+ * A pool of files managed to keep index files that are 'exported' on demand.
+ * <p />
+ *
+ * <strong>Concurrent Semantics</strong><br />
+ * thread-safe
+ *
+ */
+final public class ExportableIndexFilePool implements FilePool {
+
+    private static final int INDEX_NUMBER_LENGTH = 4;
+    private static final int TRIAL_TIMES = 10;  // must not be exceed ten consecutive numbered files
+    private static final int POOL_SIZE = 10;  // must be greater than zero
+    private static final String INDEX_SUFFIX = ".index";
+    private static final String INDEX_FILENAME_SUFFIX_FORMAT = INDEX_SUFFIX + "%04d"; // last four digits assumed in set-up
+    private final String fileFormat;
+    private final File indexLocationDir;
+
+    private final Object monitorIndexPool = new Object(); // protects all following private state
+        private final List<File> exportedIndexes;
+        private final List<File> toBeDeleted;
+        private volatile int indexFileNameNumber;
+        private final List<File> generatedIndexFiles;
+
+
+    public ExportableIndexFilePool(File indexLocationDir, String fileNameBase) {
+        this.indexLocationDir = indexLocationDir;
+        this.fileFormat = fileNameBase + INDEX_FILENAME_SUFFIX_FORMAT;
+        
+        final String filePrefix = fileNameBase + INDEX_SUFFIX;
+        this.exportedIndexes = new ArrayList<File>(POOL_SIZE);
+        collectExportedIndexesAndDetermineLastIndexValue(this.indexLocationDir, this.exportedIndexes, filePrefix);
+        
+        this.indexFileNameNumber = determineLastIndexValue(this.exportedIndexes); 
+        
+        this.toBeDeleted = new ArrayList<File>(0);
+        this.generatedIndexFiles = new ArrayList<File>(0);
+        clearOldIndexes();
+    }
+
+    public File generateNextPoolFile() throws FilePoolException {
+        synchronized (monitorIndexPool) {
+            for (int i=0; i<TRIAL_TIMES; ++i) {
+                if (++this.indexFileNameNumber > 9999) {
+                    this.indexFileNameNumber = 0;
+                }
+                final File indexFile = new File(this.indexLocationDir, String.format(this.fileFormat, this.indexFileNameNumber));
+                try {
+                    final File canonicalIndexFile = indexFile.getCanonicalFile();
+                    if (!this.generatedIndexFiles.contains(canonicalIndexFile)) {
+                        if (canonicalIndexFile.createNewFile()) {
+                            this.generatedIndexFiles.add(canonicalIndexFile);
+                            return canonicalIndexFile;
+                        }
+                    }
+                } catch (IOException e) {
+                    throw new FilePoolException("Cannot generate new pool file in '" + this.indexLocationDir + "'.", e);
+                }
+            }
+        }
+        throw new FilePoolException("Cannot generate new pool file for '" + this.indexLocationDir + "'.");
+    }
+    
+    public void putFileInPool(File indexFile) throws FilePoolException {
+        synchronized (monitorIndexPool) {
+            try {
+                File canonicalFile = indexFile.getCanonicalFile();
+                if (this.generatedIndexFiles.contains(canonicalFile)) {
+                    this.exportedIndexes.add(0, canonicalFile);
+                }
+            } catch (IOException e) {
+                throw new FilePoolException("Cannot put file in pool", e);
+            }
+            clearOldIndexes();
+        }
+    }
+    
+    public File getMostRecentPoolFile() throws FilePoolException {
+        synchronized (monitorIndexPool) {
+            if (this.exportedIndexes.isEmpty()) {
+                throw new FilePoolException("No file in exportable index file pool in '" + this.indexLocationDir + "'.");
+            }
+            File indexFile = this.exportedIndexes.get(0);
+            clearOldIndexes();
+            return indexFile;
+        }
+    }
+
+    private static int collectExportedIndexesAndDetermineLastIndexValue(File indexLocationDir, List<File> exportedIndexes, final String filePrefix) {
+        if (indexLocationDir==null || (indexLocationDir.exists() && !indexLocationDir.isDirectory())) {
+            throw new IllegalArgumentException("Index location '" + indexLocationDir + "' for index pool must be a directory.");
+        }
+        if (!indexLocationDir.exists()) {
+            if (!indexLocationDir.mkdirs()) {
+                throw new IllegalArgumentException("Index location '" + indexLocationDir + "' cannot be created.");
+            }
+        }
+
+        try {
+            fillAndOrderExportedIndexes(indexLocationDir, exportedIndexes, filePrefix);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Directory '" + indexLocationDir + "' cannot be used for indexes.");
+        }
+        
+        return determineLastIndexValue(exportedIndexes);
+    }
+
+    private static void fillAndOrderExportedIndexes(File indexLocationDir, List<File> exportedIndexes, final String filePrefix) throws IOException {
+        List<LastModifiedOrderableFile> orderableFileList = new ArrayList<LastModifiedOrderableFile>();
+        final int indexNameLength = filePrefix.length() + INDEX_NUMBER_LENGTH; 
+        for (File file : FileSystemUtils.listFiles
+            ( indexLocationDir, 
+                new FileFilter() 
+                    { public boolean accept(File pathname) 
+                        { 
+                            if (pathname.isDirectory())
+                                return false;
+                            String name = pathname.getName();
+                            if (name.length() == indexNameLength) {
+                                if (name.startsWith(filePrefix) 
+                                    && allDigits(name.substring(indexNameLength - INDEX_NUMBER_LENGTH, indexNameLength))) {
+                                    return true;
+                                }
+                            }
+                            return false;
+                        }
+                    }
+                )
+            ) {
+            orderableFileList.add(new LastModifiedOrderableFile(file.getCanonicalFile()));
+        }
+         
+        Collections.<LastModifiedOrderableFile>sort(orderableFileList);
+        
+        for (LastModifiedOrderableFile lmoFile : orderableFileList) {
+            exportedIndexes.add(lmoFile.getFile());
+        }
+        
+        orderableFileList.clear();
+    }
+    
+    private static boolean allDigits(String string) {
+        final char[] chars = string.toCharArray();
+        for (char c : chars) {
+            if ("0123456789".indexOf(c)==-1) return false;
+        }
+        return true;
+    }
+
+    private static class LastModifiedOrderableFile implements Comparable<LastModifiedOrderableFile> {
+        private final File file;
+        private final long lastModifiedValue;
+        public LastModifiedOrderableFile(File file) {
+            this.file = file;
+            this.lastModifiedValue = file.lastModified();
+        }
+        public int compareTo(LastModifiedOrderableFile o) {
+            long diff = o.lastModifiedValue - this.lastModifiedValue;
+            return (diff<0) ? -1 : ((diff>0) ? +1 : 0);
+        }
+        public boolean equals(Object o) {
+            if (o instanceof LastModifiedOrderableFile) {
+                return ((LastModifiedOrderableFile) o).lastModifiedValue == this.lastModifiedValue;
+            }
+            return false;
+        }
+        
+        public int hashCode() {
+            assert false : "hashCode not designed";
+            return 13; // any arbitrary constant will do 
+        }
+        
+        public File getFile() {
+            return this.file;
+        }
+    }
+
+    /**
+     * Precondition: exportedIndexes must be in newest-->oldest order.
+     * @param exportedIndexes list of files
+     * @return last index value found on newest file name
+     */
+    private static int determineLastIndexValue(List<File> exportedIndexes) {
+        int lastIndexValue = 0;
+        for (int i = exportedIndexes.size()-1; i>=0; --i) {    
+            File file = exportedIndexes.get(i);
+            try {
+                String filename = file.getName();
+                String lastFourChars = filename.substring(filename.length()-4, filename.length());
+                int indexNumber = Integer.parseInt(lastFourChars);
+                lastIndexValue = indexNumber;
+            } catch (IndexOutOfBoundsException e) {
+            } catch (NumberFormatException e) {
+            }
+        }
+        return lastIndexValue;
+    }
+    
+    private void clearOldIndexes() {
+        if (this.exportedIndexes.size()>POOL_SIZE) {
+            for (int i = this.exportedIndexes.size() - 1; i >= POOL_SIZE; --i) {
+                File indexFile = this.exportedIndexes.remove(i);
+                this.generatedIndexFiles.remove(indexFile);
+                if (indexFile.exists() && !indexFile.delete()) {
+                    this.toBeDeleted.add(indexFile);
+                }
+            }
+        }
+        if (!this.toBeDeleted.isEmpty()) {
+            List<File> remnant = new ArrayList<File>(this.toBeDeleted.size());
+            for (int i = 0; i < this.toBeDeleted.size(); ++i) {
+                File file = this.toBeDeleted.get(i);
+                if (file.exists() && !file.delete()) {
+                    remnant.add(file);
+                }
+            }
+            this.toBeDeleted.clear();
+            this.toBeDeleted.addAll(remnant);
+        }
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/ExportingArtifactDescriptorPersister.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/ExportingArtifactDescriptorPersister.java
new file mode 100644
index 0000000..f23ded4
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/ExportingArtifactDescriptorPersister.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.virgo.repository.ArtifactDescriptorPersister;
+
+/**
+ * An extension of {@link ArtifactDescriptorPersister} which allows export of the index file.
+ *
+ */
+public interface ExportingArtifactDescriptorPersister extends ArtifactDescriptorPersister {
+    /**
+     * @return a persisted index file 
+     * @throws IOException if such a file cannot be supplied
+     */
+    public File exportIndexFile() throws IOException;
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/FilePool.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/FilePool.java
new file mode 100644
index 0000000..41e5443
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/FilePool.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import java.io.File;
+
+/**
+ * Interface to manage a pool of files. Only the last file put in the pool is guaranteed to be present.
+ * <p />
+ *
+ */
+public interface FilePool {
+    
+    /**
+     * Generates a new writable file which can be placed in the pool
+     * @return newly created file
+     * @throws FilePoolException if pool is full or cannot be written to
+     */
+    File generateNextPoolFile() throws FilePoolException;
+    
+    /**
+     * Add file to pool.<br/>
+     * Files not returned by {@link #generateNextPoolFile()} may be ignored.
+     * @param indexFile to be placed in the pool
+     * @throws FilePoolException if IOException occurs on File operations
+     */
+    void putFileInPool(File indexFile) throws FilePoolException;
+    
+    /**
+     * @return the last file placed in the pool
+     * @throws FilePoolException if the pool is empty
+     */
+    File getMostRecentPoolFile() throws FilePoolException;
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/FilePoolException.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/FilePoolException.java
new file mode 100644
index 0000000..ff15d76
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/FilePoolException.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+/**
+ * Exceptions from {@link FilePool} class
+ * <p />
+ *
+ */
+public class FilePoolException extends Exception {
+    
+    private static final long serialVersionUID = -5591757057162475613L;
+
+    public FilePoolException(String message, Throwable throwable) {
+        super(message, throwable);
+    }
+
+    public FilePoolException(String message) {
+        super(message);
+    }
+
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepository.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepository.java
new file mode 100644
index 0000000..bbf5dad
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepository.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.management.ManagementFactory;
+import java.net.URI;
+
+import javax.management.JMException;
+import javax.management.ObjectInstance;
+
+import org.eclipse.virgo.apps.repository.core.HostedRepositoryInfo;
+import org.eclipse.virgo.apps.repository.core.RepositoryIndex;
+import org.eclipse.virgo.repository.ArtifactDescriptor;
+import org.eclipse.virgo.repository.Repository;
+import org.eclipse.virgo.util.osgi.manifest.VersionRange;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * <strong>Concurrent Semantics</strong><br />
+ * 
+ * Thread-safe
+ * 
+ */
+class HostedRepository {
+
+    private final String name; // hosted repository name
+
+    private final Repository repository;
+
+    private final ExportingArtifactDescriptorPersister persister;
+
+    private final HostedRepositoryUriMapper uriMapper;
+    
+    private final HostedRepositoryObjectNameFactory objectNameFactory;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(HostedRepository.class);
+
+    private volatile ObjectInstance mBean;
+
+    HostedRepository(Repository repository, ExportingArtifactDescriptorPersister persister, HostedRepositoryUriMapper uriMapper, HostedRepositoryObjectNameFactory objectNameFactory) {
+        this.name = (null != repository) ? repository.getName() : "";
+        this.repository = repository;
+        this.persister = persister;
+        this.uriMapper = uriMapper;
+        this.objectNameFactory = objectNameFactory;
+    }
+
+    URI inverseMapping(String type, String name, String version) {
+        ArtifactDescriptor descriptor = this.repository.get(type, name, new VersionRange("[" + version + "," + version + "]"));
+        if (descriptor != null) {
+            return this.uriMapper.inverseMapping(descriptor.getUri());
+        }
+        return null;
+    }
+
+    RepositoryIndex getRepositoryIndex() throws IOException {
+        return new ImmutableHostedRepositoryIndex(this.persister);
+    }
+
+    private void registerMBean() {
+        try {
+            this.mBean = ManagementFactory.getPlatformMBeanServer().registerMBean(this.createMBean(),
+                this.objectNameFactory.createObjectName(this.name));
+        } catch (JMException jme) {
+            LOGGER.warn(String.format("Management Bean for hosted repository '%s' not registered.", this.name), jme);
+        }
+    }
+
+    void start() {
+        this.registerMBean();
+    }
+    
+    void stop() {
+        this.deRegisterMBean();
+    }
+
+    private void deRegisterMBean() {
+        if (this.mBean != null) {
+            try {
+                ManagementFactory.getPlatformMBeanServer().unregisterMBean(this.mBean.getObjectName());
+            } catch (JMException jme) {
+                LOGGER.warn(String.format("Management Bean for hosted repository '%s' cannot be deregistered.", this.name), jme);
+            }
+        }
+    }
+
+    HostedRepositoryInfo createMBean() {
+        return new StandardHostedRepositoryInfo(this.uriMapper.getUriPrefix(), this.repository.getName());
+    }
+    
+    String getName() {
+        return name;
+    }
+    
+
+    private static class ImmutableHostedRepositoryIndex implements RepositoryIndex {
+
+        private final File indexFile;
+        private final int length;
+        private final long eTag;
+
+        private ImmutableHostedRepositoryIndex(ExportingArtifactDescriptorPersister persister) throws IOException {
+            File indexFile = null;
+            try {
+                indexFile = persister.exportIndexFile();
+            } catch (IOException e) {
+                LOGGER.error("Cannot get indexFile from lazy persister",e);
+                throw e;
+            }
+            if (indexFile==null) {
+                LOGGER.error("Cannot get indexFile from lazy persister");
+                throw new IllegalArgumentException("Exporting persister did not supply an index file");
+            }
+            this.eTag = indexFile.lastModified();
+            this.length = (int) indexFile.length();
+            this.indexFile = indexFile;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public String getETag() {
+            return Long.toString(this.eTag);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public InputStream getInputStream() throws IOException {
+            return new FileInputStream(this.indexFile);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public int getLength() {
+            return this.length;
+        }
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryLogEvents.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryLogEvents.java
new file mode 100644
index 0000000..667564e
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryLogEvents.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import org.eclipse.virgo.medic.eventlog.Level;
+import org.eclipse.virgo.medic.eventlog.LogEvent;
+
+/**
+ * <code>enum</code> of {@link LogEvent}s for the Hosted Repository code.
+ * <p />
+ * <strong>Concurrent Semantics</strong><br />
+ * utterly thread-safe
+ * 
+ */
+public enum HostedRepositoryLogEvents implements LogEvent {
+    /** 
+     * The Hosted Repository configuration is incorrect. */
+    CONFIGURATION_EXCEPTION(1, Level.WARNING),
+    /** 
+     * The repository '{}' in a hosted repository configuration was not created. */
+    REPOSITORY_EXCEPTION(2, Level.WARNING),
+    /** 
+     * The host address for the repository '{}' cannot be determined. */
+    HOST_ADDRESS_EXCEPTION(3, Level.WARNING),
+    /** 
+     * The chain definition '{}' is ignored in a hosted repository configuration. */
+    CHAIN_NON_EMPTY(4, Level.WARNING),
+    /**
+     * The repository '{}' in a hosted repository configuration is not supported and is ignored. */
+    NON_SUPPORTED_REPOSITORY(5, Level.WARNING);
+
+    private static final String SERVER_LOG_FORMAT = "%s%04d%1.1s";
+
+    private static final String PREFIX = "HR";
+
+    private final int code;
+
+    private final Level level;
+
+    private HostedRepositoryLogEvents(int code, Level level) {
+        this.code = code;
+        this.level = level;
+    }
+
+    public String getEventCode() {
+        return String.format(HostedRepositoryLogEvents.SERVER_LOG_FORMAT, HostedRepositoryLogEvents.PREFIX, this.code, this.level);
+    }
+
+    public Level getLevel() {
+        return this.level;
+    }
+
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryObjectNameFactory.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryObjectNameFactory.java
new file mode 100644
index 0000000..44ef8e3
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryObjectNameFactory.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+/**
+ * Generate {@link ObjectName}s for the hosted repository instances
+ * <p />
+ * 
+ * <strong>Concurrent Semantics</strong><br />
+ * Thread-safe
+ * 
+ */
+public class HostedRepositoryObjectNameFactory {
+
+    private static final String OBJECT_NAME_PATTERN = "%s:type=HostedRepository,name=%s";
+
+    private final String domain;
+
+    public HostedRepositoryObjectNameFactory(String domain) {
+        this.domain = domain;
+    }
+
+    /**
+     * Creates a uniform object name based on the name of the hosted repository
+     * 
+     * @param repositoryName The name of the repository
+     * @return The uniform object name
+     * @throws NullPointerException but this should never happen
+     * @throws MalformedObjectNameException if the generated object name would be badly formed
+     */
+    public ObjectName createObjectName(String repositoryName) throws MalformedObjectNameException, NullPointerException {
+        return new ObjectName(String.format(OBJECT_NAME_PATTERN, this.domain, repositoryName));
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryUriMapper.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryUriMapper.java
new file mode 100644
index 0000000..0ccf993
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryUriMapper.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.osgi.framework.Version;
+
+import org.eclipse.virgo.repository.UriMapper;
+
+/**
+ * <strong>Concurrent Semantics</strong><br />
+ * 
+ * Thread-safe.
+ * 
+ */
+class HostedRepositoryUriMapper implements UriMapper {
+
+    private final String uriPrefix;
+
+    private final Map<URI, URI> mappings = new HashMap<URI, URI>();
+
+    HostedRepositoryUriMapper(int port, String repositoryName) throws UnknownHostException {
+        String hostname = InetAddress.getLocalHost().getCanonicalHostName();
+        this.uriPrefix = String.format("http://%s:%s/org.eclipse.virgo.apps.repository/%s", hostname, port, repositoryName);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public URI map(URI uri, String type, String name, Version version) {
+        URI mapping = URI.create(String.format("%s/%s/%s/%s", this.uriPrefix, type, name, version.toString()));
+        this.mappings.put(mapping, uri);
+
+        return mapping;
+    }
+
+    URI inverseMapping(URI uri) {
+        return this.mappings.get(uri);
+    }
+
+    public String getUriPrefix() {
+        return this.uriPrefix;
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/LazyExportableXMLArtifactDescriptorPersister.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/LazyExportableXMLArtifactDescriptorPersister.java
new file mode 100644
index 0000000..aa44014
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/LazyExportableXMLArtifactDescriptorPersister.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.virgo.repository.RepositoryAwareArtifactDescriptor;
+import org.eclipse.virgo.repository.codec.RepositoryCodec;
+import org.eclipse.virgo.repository.ArtifactDescriptorPersister;
+import org.eclipse.virgo.repository.IndexFormatException;
+import org.eclipse.virgo.repository.XmlArtifactDescriptorPersister;
+
+
+/**
+ * An {@link ArtifactDescriptorPersister} which allows export of the persisted index file and only generates this when export is requested.
+ * It delegates to {@link XmlArtifactDescriptorPersister}s to do the actual writing. <p /> 
+ *
+ * <strong>Concurrent Semantics</strong><br />
+ * This implementation is thread-safe.
+ *
+ */
+class LazyExportableXMLArtifactDescriptorPersister implements ExportingArtifactDescriptorPersister {
+
+    private final String repositoryName;
+    
+    private final RepositoryCodec repositoryCodec;
+    
+    private final Object monitorPersister = new Object(); // serialises access to following private state
+        private volatile boolean currentSetPersisted;
+        private final Set<RepositoryAwareArtifactDescriptor> artifactDescriptors = new HashSet<RepositoryAwareArtifactDescriptor>();
+        private final FilePool indexPool;
+
+    public LazyExportableXMLArtifactDescriptorPersister(String repositoryName, RepositoryCodec repositoryCodec, FilePool indexPool) {
+        this.repositoryCodec = repositoryCodec;
+        this.repositoryName = repositoryName;
+        this.currentSetPersisted = false;
+        this.indexPool = indexPool;
+    }
+
+    public Set<RepositoryAwareArtifactDescriptor> loadArtifacts() throws IndexFormatException {
+        synchronized (monitorPersister) {
+            Set<RepositoryAwareArtifactDescriptor> artifactDescriptorsCopy = new HashSet<RepositoryAwareArtifactDescriptor>(this.artifactDescriptors.size());
+            artifactDescriptorsCopy.addAll(this.artifactDescriptors);
+            return artifactDescriptorsCopy;
+        }
+    }
+
+    public void persistArtifactDescriptors(Set<RepositoryAwareArtifactDescriptor> descriptors) throws IOException {
+        synchronized (monitorPersister) {
+            this.artifactDescriptors.clear();
+            this.artifactDescriptors.addAll(descriptors);
+            this.currentSetPersisted = false;
+        }
+    }
+    
+    public File exportIndexFile() throws IOException {
+        File indexFile = null;
+        synchronized (monitorPersister) {
+            try {
+                if (!currentSetPersisted) {
+                    indexFile = this.indexPool.generateNextPoolFile();
+                    ArtifactDescriptorPersister artifactDescriptorPersister = new XmlArtifactDescriptorPersister(this.repositoryCodec, this.repositoryName, indexFile);
+                    artifactDescriptorPersister.persistArtifactDescriptors(this.artifactDescriptors);
+                    this.indexPool.putFileInPool(indexFile);
+                    this.currentSetPersisted = true;
+                } else {
+                    indexFile = this.indexPool.getMostRecentPoolFile();
+                }
+            } catch (FilePoolException e) {
+                throw new IOException(e.getMessage(), e);
+            }
+        }
+        return indexFile;
+    }
+
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/StandardHostedRepositoryInfo.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/StandardHostedRepositoryInfo.java
new file mode 100644
index 0000000..53bc10c
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/StandardHostedRepositoryInfo.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import org.eclipse.virgo.apps.repository.core.HostedRepositoryInfo;
+
+
+/**
+ * Standard implementation of the {@link HostedRepositoryInfo} MBean 
+ * <p />
+ *
+ * <strong>Concurrent Semantics</strong><br />
+ * Thread-safe.
+ *
+ */
+class StandardHostedRepositoryInfo implements HostedRepositoryInfo {
+
+    private final String uriPrefix;
+    private final String localRepositoryName;
+    
+    StandardHostedRepositoryInfo(String uriPrefix, String localRepositoryName) {
+        this.uriPrefix = uriPrefix;
+        this.localRepositoryName = localRepositoryName;
+    }
+    
+    /** 
+     * {@inheritDoc}
+     */
+    public String getLocalRepositoryName() {
+        return this.localRepositoryName;
+    }
+
+    /** 
+     * {@inheritDoc}
+     */
+    public String getUriPrefix() {
+        return this.uriPrefix;
+    }
+
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/StandardRepositoryManager.java b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/StandardRepositoryManager.java
new file mode 100644
index 0000000..8a88dc8
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/java/org/eclipse/virgo/apps/repository/core/internal/StandardRepositoryManager.java
@@ -0,0 +1,186 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.eclipse.virgo.apps.repository.core.RepositoryIndex;
+import org.eclipse.virgo.apps.repository.core.RepositoryManager;
+import org.eclipse.virgo.kernel.services.work.WorkArea;
+import org.eclipse.virgo.medic.eventlog.EventLogger;
+import org.eclipse.gemini.web.core.ConnectorDescriptor;
+import org.eclipse.gemini.web.core.WebContainerProperties;
+import org.eclipse.virgo.repository.ArtifactBridge;
+import org.eclipse.virgo.repository.Repository;
+import org.eclipse.virgo.repository.RepositoryCreationException;
+import org.eclipse.virgo.repository.RepositoryFactory;
+import org.eclipse.virgo.repository.codec.XMLRepositoryCodec;
+import org.eclipse.virgo.repository.configuration.PersistentRepositoryConfiguration;
+import org.eclipse.virgo.repository.configuration.PropertiesRepositoryConfigurationReader;
+import org.eclipse.virgo.repository.configuration.RepositoryConfiguration;
+import org.eclipse.virgo.repository.configuration.RepositoryConfigurationException;
+import org.eclipse.virgo.util.math.OrderedPair;
+
+/**
+ * <strong>Concurrent Semantics</strong><br />
+ * 
+ * Thread-safe.
+ * 
+ */
+class StandardRepositoryManager implements RepositoryManager {
+
+    private final EventLogger eventLogger;
+
+    private final Map<String, HostedRepository> repositories = new HashMap<String, HostedRepository>();
+
+    StandardRepositoryManager(Properties configuration, RepositoryFactory repositoryFactory, WorkArea workArea, Set<ArtifactBridge> artifactBridges, String repositoryManagementDomain, HostedRepositoryObjectNameFactory objectNameFactory, WebContainerProperties webContainerProperties, EventLogger eventLogger) {
+        this(formConfigurationMap(configuration, workArea, artifactBridges, repositoryManagementDomain, eventLogger), repositoryFactory,
+            objectNameFactory, webContainerProperties, eventLogger);
+    }
+    
+    StandardRepositoryManager(Map<String, RepositoryConfiguration> configurationMap, RepositoryFactory repositoryFactory, HostedRepositoryObjectNameFactory objectNameFactory, WebContainerProperties webContainerProperties, EventLogger eventLogger) {
+        
+        this.eventLogger = eventLogger;
+        int port = determineHttpPort(webContainerProperties);
+        checkPersistentRepositoryConfigurations(configurationMap.values());
+
+        for (Entry<String, RepositoryConfiguration> mapEntry : configurationMap.entrySet()) {
+            String repositoryName = mapEntry.getKey();
+            
+            RepositoryConfiguration repositoryConfiguration = mapEntry.getValue();
+            if (repositoryConfiguration instanceof PersistentRepositoryConfiguration) {
+                PersistentRepositoryConfiguration persistentRepositoryConfiguration = (PersistentRepositoryConfiguration) repositoryConfiguration;
+                try {
+                    HostedRepositoryUriMapper uriMapper = new HostedRepositoryUriMapper(port, repositoryName);
+                    persistentRepositoryConfiguration.setUriMapper(uriMapper);
+                    ExportableIndexFilePool filePool = new ExportableIndexFilePool(persistentRepositoryConfiguration.getIndexLocation(), repositoryName);
+                    ExportingArtifactDescriptorPersister artifactDescriptorPersister = 
+                        new LazyExportableXMLArtifactDescriptorPersister(repositoryName, new XMLRepositoryCodec(), filePool);
+                    Repository repository = repositoryFactory.createRepository(persistentRepositoryConfiguration, artifactDescriptorPersister);
+                    HostedRepository hostedRepository = new HostedRepository(repository, artifactDescriptorPersister, uriMapper, objectNameFactory);
+
+                    repositories.put(repositoryName, hostedRepository);
+                } catch (UnknownHostException uhe) {
+                    eventLogger.log(HostedRepositoryLogEvents.HOST_ADDRESS_EXCEPTION, uhe, repositoryName);
+                } catch (RepositoryCreationException rce) {
+                    eventLogger.log(HostedRepositoryLogEvents.REPOSITORY_EXCEPTION, rce, repositoryName);
+                }
+            }
+        }
+    }
+
+    private static final Map<String, RepositoryConfiguration> formConfigurationMap(Properties configuration, WorkArea workArea,
+        Set<ArtifactBridge> artifactBridges, String repositoryManagementDomain, EventLogger eventLogger) {
+        Set<ArtifactBridge> copySet = new HashSet<ArtifactBridge>();
+        copySet.addAll(artifactBridges);
+
+        PropertiesRepositoryConfigurationReader configurationReader = new PropertiesRepositoryConfigurationReader(
+            workArea.getWorkDirectory().toFile(), copySet, eventLogger, repositoryManagementDomain);
+        OrderedPair<Map<String, RepositoryConfiguration>, List<String>> configurations;
+        try {
+            configurations = configurationReader.readConfiguration(configuration);
+            checkNoChainDefined(configurations, eventLogger);
+            return configurations.getFirst();
+        } catch (RepositoryConfigurationException rce) {
+            eventLogger.log(HostedRepositoryLogEvents.CONFIGURATION_EXCEPTION, rce);
+        }
+        return null;
+    }
+
+    private static final void checkNoChainDefined(OrderedPair<Map<String, RepositoryConfiguration>, List<String>> configurations,
+        EventLogger eventLogger) {
+        if (!configurations.getSecond().isEmpty()) {
+            final List<String> chainList = configurations.getSecond();
+            String chainListString = chainList.get(0);
+            for (int i = 1; i < chainList.size(); ++i) {
+                chainListString += "," + chainList.get(i);
+            }
+            eventLogger.log(HostedRepositoryLogEvents.CHAIN_NON_EMPTY, chainListString);
+        }
+    }
+
+    private final void checkPersistentRepositoryConfigurations(Collection<RepositoryConfiguration> configurationSet) {
+        for (RepositoryConfiguration repositoryConfiguration : configurationSet) {
+            if (!(repositoryConfiguration instanceof PersistentRepositoryConfiguration)) {
+                this.eventLogger.log(HostedRepositoryLogEvents.NON_SUPPORTED_REPOSITORY, repositoryConfiguration.getName());
+            }
+        }
+    }
+
+    private final static int determineHttpPort(final WebContainerProperties webContainerProperties) {
+        Set<ConnectorDescriptor> connectorDescriptors = webContainerProperties.getConnectorDescriptors();
+        int result = -1;
+        for(ConnectorDescriptor connectorDescriptor : connectorDescriptors) {
+            if(connectorDescriptor.sslEnabled() == false && connectorDescriptor.getScheme().contains("http")) {
+                result = connectorDescriptor.getPort();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Start the hosted repositories successfully constructed
+     */
+    void start() {
+        for (Entry<String, HostedRepository> entry : this.repositories.entrySet()) {
+            entry.getValue().start();
+        }
+    }
+
+    /**
+     * Stop the hosted repositories successfully constructed
+     */
+    void stop() {
+        for (Entry<String, HostedRepository> entry : this.repositories.entrySet()) {
+            entry.getValue().stop();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public InputStream getArtifact(String repositoryName, String type, String name, String version) {
+        HostedRepository hostedRepository = this.repositories.get(repositoryName);
+        if (hostedRepository != null) {
+            try {
+                URI originalUri = hostedRepository.inverseMapping(type, name, version);
+                return null == originalUri ? null : originalUri.toURL().openStream();
+            } catch (IOException ioe) {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @throws IOException 
+     */
+    public RepositoryIndex getIndex(String repositoryName) throws IOException {
+        HostedRepository hostedRepository = this.repositories.get(repositoryName);
+        if (hostedRepository != null) {
+            return hostedRepository.getRepositoryIndex();
+        }
+        return null;
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/resources/EventLogMessages.properties b/apps/org.eclipse.virgo.apps.repository.core/src/main/resources/EventLogMessages.properties
new file mode 100644
index 0000000..4bf1d96
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/resources/EventLogMessages.properties
@@ -0,0 +1,5 @@
+HR0001W=The Hosted Repository configuration is incorrect.
+HR0002W=The repository '{}' in a hosted repository configuration was not created.
+HR0003W=The host address for the repository '{}' cannot be determined.
+HR0004W=The chain definition '{}' is ignored in a hosted repository configuration.
+HR0005W=The repository '{}' in a hosted repository configuration is not supported and is ignored.
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/main/resources/META-INF/spring/hosted-repository-context.xml b/apps/org.eclipse.virgo.apps.repository.core/src/main/resources/META-INF/spring/hosted-repository-context.xml
new file mode 100644
index 0000000..7562016
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/main/resources/META-INF/spring/hosted-repository-context.xml
@@ -0,0 +1,45 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:osgi="http://www.springframework.org/schema/osgi"
+	xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
+		http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+		
+		<bean id="repositoryManager" class="org.eclipse.virgo.apps.repository.core.internal.StandardRepositoryManager"
+				init-method="start" destroy-method="stop">
+			<constructor-arg>
+				<osgix:cm-properties persistent-id="org.eclipse.virgo.apps.repository"/>
+			</constructor-arg>
+			<constructor-arg>
+				<osgi:reference interface="org.eclipse.virgo.repository.RepositoryFactory"/>
+			</constructor-arg>
+			<constructor-arg>
+				<osgi:reference interface="org.eclipse.virgo.kernel.services.work.WorkArea"/>
+			</constructor-arg>
+			<constructor-arg>
+				<osgi:set interface="org.eclipse.virgo.repository.ArtifactBridge"/>
+			</constructor-arg>
+			<constructor-arg value="${domain}"/>
+			<constructor-arg ref="objectNameFactory"/>
+			<constructor-arg ref="webContainerProperties"/>
+			<constructor-arg ref="eventLogger"/>
+		</bean>
+		
+		<bean id="objectNameFactory" class="org.eclipse.virgo.apps.repository.core.internal.HostedRepositoryObjectNameFactory">
+			<constructor-arg value="org.eclipse.virgo.server"/>
+		</bean>
+
+        <osgi:reference id="eventLogger" interface="org.eclipse.virgo.medic.eventlog.EventLogger"/>
+		
+		<osgi:service ref="repositoryManager" interface="org.eclipse.virgo.apps.repository.core.RepositoryManager"/>
+		
+		<osgi:reference id="webContainerProperties" interface="org.eclipse.gemini.web.core.WebContainerProperties" />
+		
+		<osgix:cm-properties id="kernelConfig" persistent-id="org.eclipse.virgo.kernel"/>
+		
+		<context:property-placeholder properties-ref="kernelConfig"/>
+</beans>
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/ExportableIndexFilePoolTests.java b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/ExportableIndexFilePoolTests.java
new file mode 100644
index 0000000..6053520
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/ExportableIndexFilePoolTests.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.File;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.eclipse.virgo.apps.repository.core.internal.ExportableIndexFilePool;
+import org.eclipse.virgo.apps.repository.core.internal.FilePool;
+import org.eclipse.virgo.apps.repository.core.internal.FilePoolException;
+import org.eclipse.virgo.util.io.PathReference;
+
+
+
+/**
+ * Tests for {@link ExportableIndexFilePool} implementation of {@link FilePool}
+ * 
+ */
+public class ExportableIndexFilePoolTests {
+
+    private FilePool filePool;
+    private File dirFile = new File("build/testfilepooldir");
+    
+    @Before
+    public void setupFilePools() throws Exception {
+        this.dirFile = this.dirFile.getCanonicalFile();
+        clearTestDirs();
+    }
+    
+    @After
+    public void clearupFilePools() {
+        clearTestDirs();
+    }
+    
+    private void clearTestDirs() {
+        PathReference pr = new PathReference(this.dirFile);
+        pr.createDirectory().delete(true);
+    }
+    
+    @Test 
+    public void generateNextPoolFile() throws Exception {
+        this.filePool = new ExportableIndexFilePool(this.dirFile, "testfilepoolfilename");  
+        
+        File file1 = this.filePool.generateNextPoolFile();
+        assertNotNull(file1);
+        assertEquals(new File(this.dirFile,"testfilepoolfilename.index0001"), file1);
+        
+        File file2 = this.filePool.generateNextPoolFile();
+        assertNotNull(file2);
+        assertEquals(new File(this.dirFile,"testfilepoolfilename.index0002"), file2);
+        
+        File nextFile = null;
+        for (int i=0; i<10; ++i) {
+            nextFile = this.filePool.generateNextPoolFile();
+        }
+        assertNotNull(nextFile);
+        assertEquals(new File(this.dirFile,"testfilepoolfilename.index0012"), nextFile);
+    }
+    
+    @Test(expected=FilePoolException.class) 
+    public void getMostRecentPoolFileFromEmptyPool() throws Exception {
+        this.filePool = new ExportableIndexFilePool(this.dirFile, "testfilepoolfilename");  
+
+        this.filePool.getMostRecentPoolFile();
+    }
+
+    @Test 
+    public void getMostRecentPoolFile() throws Exception {
+        this.filePool = new ExportableIndexFilePool(this.dirFile, "testfilepoolfilename");  
+
+        File[] files = new File[13];
+        for (int i=0; i<13; ++i) {
+            files[i] = this.filePool.generateNextPoolFile();
+            this.filePool.putFileInPool(files[i]);
+        }
+        File testFile = this.filePool.getMostRecentPoolFile();
+        assertNotNull(testFile);
+        assertEquals(new File(this.dirFile,"testfilepoolfilename.index0013"), testFile);
+        assertEquals("Directory holds wrong number of indexes", 10, this.dirFile.listFiles().length);
+    }
+    
+    @Test
+    public void initialiseWithDebris() throws Exception {
+        new PathReference(new File(this.dirFile, "testfilepoolfilename.index9999")).createFile();
+        
+        this.filePool = new ExportableIndexFilePool(this.dirFile, "testfilepoolfilename");  
+        
+        File testFile = this.filePool.getMostRecentPoolFile();
+        assertEquals("found old file", new File(this.dirFile,"testfilepoolfilename.index9999"), testFile);
+        
+        testFile = this.filePool.getMostRecentPoolFile();
+        assertEquals("Get not repeatable", new File(this.dirFile,"testfilepoolfilename.index9999"), testFile);
+
+        this.filePool.putFileInPool(this.filePool.generateNextPoolFile());
+        
+        testFile = this.filePool.getMostRecentPoolFile();
+        assertEquals("Wraparound failed", new File(this.dirFile,"testfilepoolfilename.index0000"), testFile);
+
+    }
+    
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryObjectNameFactoryTests.java b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryObjectNameFactoryTests.java
new file mode 100644
index 0000000..0d62bd3
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryObjectNameFactoryTests.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import javax.management.ObjectName;
+import javax.management.MalformedObjectNameException;
+
+import org.eclipse.virgo.apps.repository.core.internal.HostedRepositoryObjectNameFactory;
+import org.junit.Test;
+
+
+
+/**
+ * Unit tests for {@link HostedRepositoryObjectNameFactory}
+ * <p />
+ *
+ * <strong>Concurrent Semantics</strong><br />
+ * Test-safe
+ *
+ */
+public class HostedRepositoryObjectNameFactoryTests {
+
+    private static final String TEST_BEAN_MGT_DOMAIN = "com.dom";
+    
+    private final HostedRepositoryObjectNameFactory objectNameFactory = new HostedRepositoryObjectNameFactory(TEST_BEAN_MGT_DOMAIN);
+
+    @Test
+    public void testCreateValidObjectName() throws Exception {
+        ObjectName objectName = objectNameFactory.createObjectName("repo-name-one");
+        assertEquals("Objectname incorrect", TEST_BEAN_MGT_DOMAIN + ":name=repo-name-one,type=HostedRepository", objectName.getCanonicalName());
+    }
+    
+    @Test(expected=MalformedObjectNameException.class)
+    public void testCreateInvalidObjectName() throws Exception {
+        ObjectName objectName = objectNameFactory.createObjectName("a: :b");
+        String oName = objectName.getCanonicalName();
+        assertFalse("Objectname '" + oName + "' should not have been generated", oName.startsWith(TEST_BEAN_MGT_DOMAIN + ":") && oName.endsWith("type=HostedRepository"));
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryTests.java b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryTests.java
new file mode 100644
index 0000000..1649ec0
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/HostedRepositoryTests.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import java.io.File;
+
+import org.junit.Test;
+
+import org.eclipse.virgo.apps.repository.core.HostedRepositoryInfo;
+import org.eclipse.virgo.apps.repository.core.internal.ExportingArtifactDescriptorPersister;
+import org.eclipse.virgo.apps.repository.core.internal.HostedRepository;
+import org.eclipse.virgo.apps.repository.core.internal.HostedRepositoryObjectNameFactory;
+import org.eclipse.virgo.apps.repository.core.internal.HostedRepositoryUriMapper;
+import org.eclipse.virgo.repository.Repository;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+
+/**
+ * Tests for {@link HostedRepository} class
+ * 
+ */
+public class HostedRepositoryTests {
+
+    @Test
+    public void createHostedRepository() throws Exception {
+        Repository repository = createMock(Repository.class);
+        expect(repository.getName()).andReturn("testHostRepoName").atLeastOnce();
+        replay(repository);
+
+        final File dummyIndexFile = new File("dummyIndexFile");
+        ExportingArtifactDescriptorPersister persister = createMock(ExportingArtifactDescriptorPersister.class);
+        expect(persister.exportIndexFile()).andReturn(dummyIndexFile).atLeastOnce();
+        replay(persister);
+        
+        final HostedRepositoryUriMapper uriMapper = new HostedRepositoryUriMapper(0, repository.getName());
+        
+        HostedRepository hr = new HostedRepository(repository, persister, uriMapper,
+            new HostedRepositoryObjectNameFactory("testHostedRepo"));
+        assertNotNull("No hosted repository created", hr);
+        assertNotNull("No index for Hosted repository", hr.getRepositoryIndex());
+        assertEquals("Hosted repository misnamed.", "testHostRepoName", hr.getName());
+        HostedRepositoryInfo mBean = hr.createMBean();
+        assertEquals("Incorrect MBean name", "testHostRepoName", mBean.getLocalRepositoryName());
+        assertEquals("Uri prefix not same as mapper",uriMapper.getUriPrefix(), mBean.getUriPrefix());
+    }
+
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/LazyExportableXMLArtifactDescriptorPersisterTests.java b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/LazyExportableXMLArtifactDescriptorPersisterTests.java
new file mode 100644
index 0000000..06f93ab
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/LazyExportableXMLArtifactDescriptorPersisterTests.java
@@ -0,0 +1,161 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+import org.osgi.framework.Version;
+
+import org.eclipse.virgo.apps.repository.core.internal.ExportingArtifactDescriptorPersister;
+import org.eclipse.virgo.apps.repository.core.internal.FilePool;
+import org.eclipse.virgo.apps.repository.core.internal.LazyExportableXMLArtifactDescriptorPersister;
+import org.eclipse.virgo.repository.ArtifactDescriptor;
+import org.eclipse.virgo.repository.Attribute;
+import org.eclipse.virgo.repository.RepositoryAwareArtifactDescriptor;
+import org.eclipse.virgo.repository.codec.RepositoryCodec;
+import org.eclipse.virgo.repository.codec.XMLRepositoryCodec;
+import org.eclipse.virgo.repository.internal.StandardArtifactDescriptor;
+import org.eclipse.virgo.util.io.PathReference;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Tests for {@link LazyExportableXMLArtifactDescriptorPersister}
+ * <p />
+ *
+ */
+public class LazyExportableXMLArtifactDescriptorPersisterTests {
+
+    private File solePoolFile = new File("build/lazypersistertest/file001");
+
+    private File nextPoolFile = new File("build/lazypersistertest/file002");
+
+    @Test
+    public void persistAndLoadArtifacts() throws Exception {
+
+        RepositoryCodec repositoryCodec = new XMLRepositoryCodec();
+
+        new PathReference(solePoolFile).createFile();
+        new PathReference(nextPoolFile).createFile();
+        FilePool filePool = new StubFilePool(solePoolFile, nextPoolFile);
+
+        ExportingArtifactDescriptorPersister persister = new LazyExportableXMLArtifactDescriptorPersister("repo-name", repositoryCodec, filePool);
+
+        Set<RepositoryAwareArtifactDescriptor> testSet = generateDescriptorSet();
+
+        persister.persistArtifactDescriptors(testSet);
+
+        Set<RepositoryAwareArtifactDescriptor> set = persister.loadArtifacts();
+
+        assertFalse("Sets are identical -- persister should copy them", testSet == set);
+
+        assertEquals("Set of descriptors returned is not the same as the set put in", testSet, set);
+    }
+
+    private Set<RepositoryAwareArtifactDescriptor> generateDescriptorSet() {
+        Set<RepositoryAwareArtifactDescriptor> setDescriptors = new HashSet<RepositoryAwareArtifactDescriptor>();
+        RepositoryAwareArtifactDescriptor raad1 = new StubRepositoryAwareArtifactDescriptor("repo-name",
+            new File("build/testlazypersister/raad1").toURI(), "bundle", "bundle.raad1", new Version("1.1"), "raad1", new HashSet<Attribute>());
+        RepositoryAwareArtifactDescriptor raad2 = new StubRepositoryAwareArtifactDescriptor("repo-name",
+            new File("build/testlazypersister/raad2").toURI(), "bundle", "bundle.raad2", new Version("1.2"), "raad2", new HashSet<Attribute>());
+
+        setDescriptors.add(raad1);
+        setDescriptors.add(raad2);
+
+        return setDescriptors;
+    }
+
+    @Test
+    public void exportIndexFile() throws Exception {
+        RepositoryCodec repositoryCodec = new XMLRepositoryCodec();
+
+        new PathReference(solePoolFile).createFile();
+        new PathReference(nextPoolFile).createFile();
+        FilePool filePool = new StubFilePool(solePoolFile, nextPoolFile);
+
+        ExportingArtifactDescriptorPersister persister = new LazyExportableXMLArtifactDescriptorPersister("repo-name", repositoryCodec, filePool);
+
+        Set<RepositoryAwareArtifactDescriptor> testSet = generateDescriptorSet();
+        persister.persistArtifactDescriptors(testSet);
+
+        File exportedFile = persister.exportIndexFile();
+        assertNotNull(exportedFile);
+
+        Set<ArtifactDescriptor> decodedOutput = repositoryCodec.read(new FileInputStream(exportedFile));
+
+        assertEquals(removeRepositoryAwareness(testSet), decodedOutput);
+    }
+
+    private static Set<ArtifactDescriptor> removeRepositoryAwareness(Set<RepositoryAwareArtifactDescriptor> raSet) {
+        final Set<ArtifactDescriptor> result = new HashSet<ArtifactDescriptor>(raSet.size());
+        for (ArtifactDescriptor artifactDescriptor : raSet) {
+            StandardArtifactDescriptor standardArtifactDescriptor = new StandardArtifactDescriptor(artifactDescriptor.getUri(),
+                artifactDescriptor.getType(), artifactDescriptor.getName(), artifactDescriptor.getVersion(), artifactDescriptor.getFilename(),
+                artifactDescriptor.getAttributes());
+            result.add(standardArtifactDescriptor);
+        }
+        return result;
+    }
+
+    private static class StubRepositoryAwareArtifactDescriptor implements RepositoryAwareArtifactDescriptor {
+
+        private final ArtifactDescriptor artifactDescriptor;
+
+        private final String repositoryName;
+
+        public StubRepositoryAwareArtifactDescriptor(String repositoryName, URI uri, String type, String name, Version version, String filename,
+            Set<Attribute> attributes) {
+            this.artifactDescriptor = new StandardArtifactDescriptor(uri, type, name, version, filename, attributes);
+            this.repositoryName = repositoryName;
+        }
+
+        public Set<Attribute> getAttribute(String name) {
+            return artifactDescriptor.getAttribute(name);
+        }
+
+        public Set<Attribute> getAttributes() {
+            return artifactDescriptor.getAttributes();
+        }
+
+        public String getFilename() {
+            return artifactDescriptor.getFilename();
+        }
+
+        public String getName() {
+            return artifactDescriptor.getName();
+        }
+
+        public String getType() {
+            return artifactDescriptor.getType();
+        }
+
+        public java.net.URI getUri() {
+            return artifactDescriptor.getUri();
+        }
+
+        public Version getVersion() {
+            return artifactDescriptor.getVersion();
+        }
+
+        public String getRepositoryName() {
+            return this.repositoryName;
+        }
+    }
+
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/StandardHostedRepositoryInfoTests.java b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/StandardHostedRepositoryInfoTests.java
new file mode 100644
index 0000000..b701ec4
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/StandardHostedRepositoryInfoTests.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import static org.junit.Assert.assertEquals;
+
+import org.eclipse.virgo.apps.repository.core.HostedRepositoryInfo;
+import org.eclipse.virgo.apps.repository.core.internal.StandardHostedRepositoryInfo;
+import org.junit.Test;
+
+
+/**
+ * Tests for {@link StandardHostedRepositoryInfo}
+ * <p />
+ * 
+ * <strong>Concurrent Semantics</strong><br />
+ * Test-safe
+ * 
+ */
+public class StandardHostedRepositoryInfoTests {
+
+    @Test
+    public void testCreateStandardHostedRepositoryInfo() {
+        String uriPrefix = "uriPrefix";
+        String localName = "localName";
+        HostedRepositoryInfo hri = new StandardHostedRepositoryInfo(uriPrefix, localName);
+        assertEquals("uriPrefix not on info mBean", uriPrefix, hri.getUriPrefix());
+        assertEquals("localRepositoryName not on info mBean", localName, hri.getLocalRepositoryName());
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/StandardRepositoryManagerTests.java b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/StandardRepositoryManagerTests.java
new file mode 100644
index 0000000..c58932f
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/StandardRepositoryManagerTests.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Test;
+
+import org.eclipse.virgo.apps.repository.core.internal.HostedRepositoryObjectNameFactory;
+import org.eclipse.virgo.apps.repository.core.internal.StandardRepositoryManager;
+import org.eclipse.virgo.kernel.services.work.WorkArea;
+import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
+import org.eclipse.gemini.web.core.ConnectorDescriptor;
+import org.eclipse.gemini.web.core.WebContainerProperties;
+import org.eclipse.virgo.repository.ArtifactBridge;
+import org.eclipse.virgo.repository.Repository;
+import org.eclipse.virgo.repository.RepositoryFactory;
+import org.eclipse.virgo.repository.configuration.ExternalStorageRepositoryConfiguration;
+import org.eclipse.virgo.repository.configuration.RepositoryConfiguration;
+import org.eclipse.virgo.repository.ArtifactDescriptorPersister;
+import org.eclipse.virgo.util.io.PathReference;
+
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Tests for {@link StandardRepositoryManager}
+ */
+public class StandardRepositoryManagerTests {
+    
+    private final MockEventLogger eventLogger = new MockEventLogger();
+
+    
+    private final Repository repository = createMock(Repository.class);
+    {
+        expect(this.repository.getName()).andReturn("testRepoName").atLeastOnce();
+        replay(this.repository);
+    }
+    
+    private final Map<String, RepositoryConfiguration> configurationMap = new HashMap<String, RepositoryConfiguration>();
+    {
+        final RepositoryConfiguration repositoryConfiguration 
+        = new ExternalStorageRepositoryConfiguration("testRepoName", new File("build/indexDir"), new HashSet<ArtifactBridge>(), "testDirToWatch", "testHostRepoDomain");
+        this.configurationMap.put("testRepoName", repositoryConfiguration);
+    }
+    
+    private final WorkArea workArea = createMock(WorkArea.class);
+    {
+        PathReference pathRef = new PathReference("abc");
+        expect(this.workArea.getWorkDirectory()).andReturn(pathRef).atLeastOnce();
+        replay(this.workArea);
+    }
+
+    private final HostedRepositoryObjectNameFactory objectNameFactory = new HostedRepositoryObjectNameFactory("testDomain");
+    
+
+    @Test
+    public void createOK() throws Exception {
+        WebContainerProperties webContainerProperties = createMock(WebContainerProperties.class);
+        Set<ConnectorDescriptor> mockConnectors = new HashSet<ConnectorDescriptor>();
+        ConnectorDescriptor mockConnectorDescriptor = createMock(ConnectorDescriptor.class);
+        expect(mockConnectorDescriptor.sslEnabled()).andReturn(false);
+        expect(mockConnectorDescriptor.getScheme()).andReturn("http-8080");
+        expect(mockConnectorDescriptor.getPort()).andReturn(8080);
+        mockConnectors.add(mockConnectorDescriptor);
+        expect(webContainerProperties.getConnectorDescriptors()).andReturn(mockConnectors);
+        
+        RepositoryFactory repositoryFactory = createMock(RepositoryFactory.class);
+        expect(repositoryFactory.createRepository(isA(RepositoryConfiguration.class), isA(ArtifactDescriptorPersister.class))).andReturn(this.repository);
+        
+        replay(repositoryFactory, webContainerProperties, mockConnectorDescriptor);
+        
+        final StandardRepositoryManager srm = new StandardRepositoryManager(this.configurationMap, repositoryFactory, this.objectNameFactory, webContainerProperties, this.eventLogger);
+        
+        assertEquals("Events logged during creation", new ArrayList<String>(), this.eventLogger.getLoggedEvents());
+        srm.start();
+        srm.stop();
+        assertEquals("Events were logged during start or stop", new ArrayList<String>(), this.eventLogger.getLoggedEvents());
+        assertNotNull("Repository index not created", srm.getIndex("testRepoName"));
+        
+        verify(repositoryFactory, webContainerProperties, mockConnectorDescriptor);
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/StubFilePool.java b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/StubFilePool.java
new file mode 100644
index 0000000..fa7caa6
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/test/java/org/eclipse/virgo/apps/repository/core/internal/StubFilePool.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.core.internal;
+
+import java.io.File;
+
+import org.eclipse.virgo.apps.repository.core.internal.FilePool;
+import org.eclipse.virgo.apps.repository.core.internal.FilePoolException;
+
+
+
+/**
+ * {@link FilePool} used for testing
+ * <p />
+ *
+ * <strong>Concurrent Semantics</strong><br />
+ * Immutable and thread-safe
+ *
+ */
+class StubFilePool implements FilePool {
+
+    private File soleFile;
+    private File nextFile;
+    
+    /**
+     * null parameters mean pool empty, or no next file respectively.
+     * @param soleFile file in pool
+     * @param nextFile next file for generate call
+     */
+    public StubFilePool(File soleFile, File nextFile) {
+        this.soleFile = soleFile;
+        this.nextFile = nextFile;
+    }
+    
+    /** 
+     * {@inheritDoc}
+     */
+    public File generateNextPoolFile() throws FilePoolException {
+        if (this.nextFile==null) 
+            throw new FilePoolException("Stub: no next file.");
+        return this.nextFile;
+    }
+
+    /** 
+     * {@inheritDoc}
+     */
+    public File getMostRecentPoolFile() throws FilePoolException {
+        if (this.soleFile==null)
+            throw new FilePoolException("Stub: pool empty");
+        return this.soleFile;
+    }
+
+    /** 
+     * {@inheritDoc}
+     */
+    public void putFileInPool(File indexFile) {
+        if (indexFile != this.nextFile) 
+            return;
+        this.soleFile = indexFile;
+        this.nextFile = null;
+    }
+
+    /**
+     * For testing only
+     * @param nextFile for generate call.
+     */
+    void setNextFile(File nextFile) {
+        this.nextFile = nextFile;
+    }
+    
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.core/src/test/resources/.gitignore b/apps/org.eclipse.virgo.apps.repository.core/src/test/resources/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/src/test/resources/.gitignore
diff --git a/apps/org.eclipse.virgo.apps.repository.core/template.mf b/apps/org.eclipse.virgo.apps.repository.core/template.mf
new file mode 100644
index 0000000..62e7d47
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.core/template.mf
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Hosted Provisioning Repository
+Bundle-SymbolicName: org.eclipse.virgo.apps.repository.core
+Bundle-Version: ${version}
+Import-Template:
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, +1)}",
+ org.eclipse.virgo.kernel.*;version="${version:[=.=.=, +1)}",
+ org.eclipse.virgo.repository.*;version="${version:[=.=.=, +1)}",
+ org.eclipse.gemini.web.*;version="${geminiWebVersion:[=.=.=, +1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
+ org.osgi.framework.*;version="0",
+ javax.management.*;version="0",
+ org.slf4j.*;version="0"
+Excluded-Exports:
+ org.eclipse.virgo.apps.repository.core.internal.*
diff --git a/apps/org.eclipse.virgo.apps.repository.test/.springBeans b/apps/org.eclipse.virgo.apps.repository.test/.springBeans
new file mode 100644
index 0000000..d079ca1
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/.springBeans
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.2.4.RELEASE]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/apps/org.eclipse.virgo.apps.repository.test/build.xml b/apps/org.eclipse.virgo.apps.repository.test/build.xml
new file mode 100644
index 0000000..83b7db1
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/build.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.virgo.apps.repository.test" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
+	<import file="${basedir}/../virgo-build/standard/default.xml"/>
+	
+	<target name="resolve.test" depends="common-common.resolve.test">
+            <ivy:resolve file="${basedir}/ivy.xml" conf="download"/>
+    </target>
+
+</project>
diff --git a/apps/org.eclipse.virgo.apps.repository.test/ivy.xml b/apps/org.eclipse.virgo.apps.repository.test/ivy.xml
new file mode 100644
index 0000000..d1a4c5d
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/ivy.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+		version="1.3">
+
+	<info organisation="org.eclipse.virgo.server" module="${ant.project.name}">
+		<ivyauthor name="awilkinson"/>
+	</info>
+
+	<configurations>
+		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="download" visibility="private" description="Dependencies to be downloaded, but not to be added to the classpath"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
+        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.core" rev="${org.eclipse.virgo.nano}" conf="test->runtime"/>
+        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.deployer.api" rev="${org.eclipse.virgo.nano}" conf="test->runtime"/>
+        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.deployer.hot" rev="${org.eclipse.virgo.nano}" conf="test->runtime"/>
+        <dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.nano.management" rev="${org.eclipse.virgo.nano}" conf="test->compile"/>
+		<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel" rev="${org.eclipse.virgo.kernel}" conf="test->runtime"/>
+		<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.services" rev="${org.eclipse.virgo.kernel}" conf="test->runtime"/>
+		<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgi" rev="${org.eclipse.virgo.kernel}" conf="test->runtime"/>		
+		<dependency org="org.eclipse.virgo.web" name="org.eclipse.virgo.web.tomcat" rev="${org.eclipse.virgo.web}" conf="download->runtime"/>
+		<dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
+		<dependency org="org.eclipse.virgo.apps" name="org.eclipse.virgo.apps.repository.core" rev="latest.integration"/>
+        <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jcl" rev="${org.slf4j.jcl}" conf="test->runtime"/>
+        <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jul" rev="${org.slf4j.jul}" conf="test->runtime"/>
+        <dependency org="org.springframework" name="org.springframework.spring-library" rev="${org.springframework}" conf="test->runtime"/>
+        <dependency org="org.eclipse.virgo.mirrored" name="javax.jms" rev="${javax.jms}" conf="test->runtime"/>
+
+		<!-- Prevent Xerces and Xalan from being on the classpath to work around Java bug 6723276 during integration testing -->
+		<exclude org="org.apache.xerces"/>
+		<exclude org="org.apache.xalan"/>
+	</dependencies>
+
+</ivy-module>
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/main/java/.gitignore b/apps/org.eclipse.virgo.apps.repository.test/src/main/java/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/main/java/.gitignore
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/java/org/eclipse/virgo/apps/repository/test/HostedRepositoryIntegrationTests.java b/apps/org.eclipse.virgo.apps.repository.test/src/test/java/org/eclipse/virgo/apps/repository/test/HostedRepositoryIntegrationTests.java
new file mode 100644
index 0000000..b3da0d1
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/java/org/eclipse/virgo/apps/repository/test/HostedRepositoryIntegrationTests.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.eclipse.virgo.nano.deployer.api.core.ApplicationDeployer;
+import org.eclipse.virgo.nano.deployer.api.core.DeploymentException;
+import org.eclipse.virgo.nano.deployer.api.core.DeploymentOptions;
+import org.eclipse.virgo.test.framework.OsgiTestRunner;
+import org.eclipse.virgo.util.io.PathReference;
+import org.eclipse.virgo.util.io.ZipUtils;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventConstants;
+import org.osgi.service.event.EventHandler;
+
+@RunWith(OsgiTestRunner.class)
+@Ignore("[DMS-2878]")
+public class HostedRepositoryIntegrationTests {
+
+    private final static File INDEX_LOCATION = new File("build/work/org.eclipse.virgo.apps.repository.core_2.0.0/integration-test.index");
+
+    private final static File W_INDEX_LOCATION = new File("build/work/org.eclipse.virgo.apps.repository.core_2.0.0/watched-integration-test.index");
+
+    private static boolean appDeployed = false;
+    
+    private ApplicationDeployer deployer;
+    
+    @BeforeClass
+    public static void awaitDeploymentOfInitialArtifacts() throws InterruptedException {
+    	final CountDownLatch latch = new CountDownLatch(1);
+    	
+    	EventHandler eventHandler = new EventHandler() {
+			public void handleEvent(Event event) {
+				if ("org/eclipse/virgo/kernel/deployer/systemartifacts/DEPLOYED".equals(event.getTopic())) {
+					latch.countDown();
+				}				
+			}    		
+    	};
+    	
+    	Dictionary<String, String> properties = new Hashtable<String, String>();
+    	properties.put(EventConstants.EVENT_TOPIC, "org/eclipse/virgo/kernel/deployer/*");
+    	FrameworkUtil.getBundle(HostedRepositoryIntegrationTests.class).getBundleContext().registerService(EventHandler.class, eventHandler, properties);
+    	
+    	if (!latch.await(30, TimeUnit.SECONDS)) {
+    		fail("Deployment of system artifacts did not complete within 30 seconds");
+    	}
+    }
+
+    @Before
+    public void setup() throws Exception {
+    	
+    	BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+    	
+    	ServiceReference<ApplicationDeployer> serviceReference = bundleContext.getServiceReference(ApplicationDeployer.class);
+        this.deployer = bundleContext.getService(serviceReference);
+    	
+        if (!appDeployed) {
+            deployHostedRepositoryApp();
+        }
+    }
+
+	private void deployHostedRepositoryApp() throws DeploymentException,
+			IOException {
+		if (INDEX_LOCATION.exists()) {
+		    assertTrue(INDEX_LOCATION.delete());
+		}
+		if (W_INDEX_LOCATION.exists()) {
+		    assertTrue(W_INDEX_LOCATION.delete());
+		}		
+		
+		DeploymentOptions deploymentOptions = new DeploymentOptions(false, false, true);
+		deployer.deploy(new File("../org.eclipse.virgo.apps.repository.core/target/classes").toURI(), deploymentOptions);
+		deployer.deploy(packageWebModule().toURI(), deploymentOptions);                        
+
+		appDeployed = true;
+	}
+
+    private static PathReference packageWebModule() throws IOException {
+        PathReference packagedModule = new PathReference("build/org.eclipse.virgo.apps.repository.web.war");
+        if (packagedModule.exists()) {
+            assertTrue(packagedModule.delete());
+        }
+        ZipUtils.zipTo(new PathReference("../org.eclipse.virgo.apps.repository.web/target/war-expanded"), packagedModule);
+        return packagedModule;
+    }
+
+    @Test(timeout=60000)
+    public void deploymentOfBundleWithConstraintsSatisfiedFromHostedRepository() throws Exception {
+        this.deployer.deploy(new File("src/test/resources/b.jar").toURI());
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/MANIFEST.MF b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..cd3d892
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0

+Export-Package: config;version="3.0.0",config.management;version="3.0.

+ 0",hosted;version="3.0.0",org.eclipse.virgo.apps.repository.test;vers

+ ion="3.0.0";uses:="org.eclipse.virgo.util.io,org.junit,org.junit.runn

+ er,org.osgi.service.event",watched;version="3.0.0"

+Bundle-Vendor: SpringSource Inc.

+Bundle-ClassPath: .,b.jar,c.jar,hosted/a.jar,b.jar,c.jar,hosted/a.jar

+Bundle-Version: 3.0.0

+Tool: Bundlor 1.0.0.RELEASE

+Bundle-Name: Hosted Provisioning Repository Test

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.virgo.apps.repository.test

+Import-Package: org.eclipse.virgo.nano.deployer.api.core;version="[3.0

+ .0,4)",org.eclipse.virgo.util.io;version="[3.0.0,4)",org.junit;versio

+ n="[4.7.0,5)",org.junit.runner;version="[4.7.0,5)",org.osgi.framework

+ ;version="0",org.osgi.service.event

+

diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/test.config.properties b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/test.config.properties
new file mode 100644
index 0000000..be66711
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/META-INF/test.config.properties
@@ -0,0 +1,64 @@
+launcher.bundles =\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.api/${org.slf4j.api}/org.slf4j.api-${org.slf4j.api}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jul/${org.slf4j.jul}/org.slf4j.jul-${org.slf4j.jul}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jcl/${org.slf4j.jcl}/org.slf4j.jcl-${org.slf4j.jcl}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/com.springsource.org.aspectj.runtime/${org.aspectj}/com.springsource.org.aspectj.runtime-${org.aspectj}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic-${org.eclipse.virgo.medic}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.core-${org.eclipse.virgo.medic}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi-${org.eclipse.virgo.util}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi.manifest-${org.eclipse.virgo.util}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/${org.eclipse.equinox.event}/org.eclipse.equinox.event-${org.eclipse.equinox.event}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.common/${org.eclipse.virgo.util}/org.eclipse.virgo.util.common-${org.eclipse.virgo.util}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.io/${org.eclipse.virgo.util}/org.eclipse.virgo.util.io-${org.eclipse.virgo.util}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.math/${org.eclipse.virgo.util}/org.eclipse.virgo.util.math-${org.eclipse.virgo.util}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.manifest-${org.eclipse.virgo.util}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.launcher-${org.eclipse.virgo.util}.jar@start,\
+ file:${ivy.cache}/repository/org.apache.commons/com.springsource.org.apache.commons.codec/1.3.0/com.springsource.org.apache.commons.codec-1.3.0.jar@start,\
+ file:${ivy.cache}/repository/org.apache.commons/com.springsource.org.apache.commons.httpclient/3.1.0/com.springsource.org.apache.commons.httpclient-3.1.0.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.repository/org.eclipse.virgo.repository/${org.eclipse.virgo.repository}/org.eclipse.virgo.repository-${org.eclipse.virgo.repository}.jar@start,\
+ file:${ivy.cache}/repository/org.springframework/org.springframework.aop/3.1.0.RELEASE/org.springframework.aop-3.1.0.RELEASE.jar,\
+ file:${ivy.cache}/repository/org.springframework/org.springframework.asm/3.1.0.RELEASE/org.springframework.asm-3.1.0.RELEASE.jar,\
+ file:${ivy.cache}/repository/org.springframework/org.springframework.expression/3.1.0.RELEASE/org.springframework.expression-3.1.0.RELEASE.jar,\
+ file:${ivy.cache}/repository/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar,\
+ file:${ivy.cache}/repository/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar,\
+ file:${ivy.cache}/repository/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-3.1.0.RELEASE.jar,\
+ file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.core-${org.eclipse.virgo.nano}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.api-${org.eclipse.virgo.nano}.jar,\
+ file:${integration.repo.dir}/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.deployer.hot-${org.eclipse.virgo.nano}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.nano/org.eclipse.virgo.nano.management/${org.eclipse.virgo.nano}/org.eclipse.virgo.nano.management-${org.eclipse.virgo.nano}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/2.0.0.M02/org.eclipse.gemini.blueprint.core-2.0.0.M02.jar,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/2.0.0.M02/org.eclipse.gemini.blueprint.extender-2.0.0.M02.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.gemini/org.eclipse.gemini.blueprint.io/2.0.0.M02/org.eclipse.gemini.blueprint.io-2.0.0.M02.jar,\
+ file:${ivy.cache}/repository/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar,\
+ file:${integration.repo.dir}/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.artifact/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.artifact-${org.eclipse.virgo.kernel}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.services/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.services-${org.eclipse.virgo.kernel}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.osgi-${org.eclipse.virgo.kernel}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.deployer-${org.eclipse.virgo.kernel}.jar@start,\
+ file:${integration.repo.dir}/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.dmfragment-${org.eclipse.virgo.kernel}.jar,\
+ file:${integration.repo.dir}/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/${org.eclipse.virgo.kernel}/org.eclipse.virgo.kernel.deployer.dm-${org.eclipse.virgo.kernel}.jar@start,\
+
+org.eclipse.virgo.test.properties.include=file:../build.versions,file:../user-ivy.properties
+
+#Equinox Configuration 
+osgi.parentClassloader=fwk
+osgi.context.bootdelegation=false
+osgi.compatibility.bootdelegation=false
+osgi.clean=true
+osgi.configuration.area=target
+
+osgi.java.profile=file:../java-server.profile
+osgi.java.profile.bootdelegation=override
+osgi.hook.configurators.include=org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator
+
+org.eclipse.virgo.kernel.home=target
+org.eclipse.virgo.kernel.domain=org.eclipse.virgo.kernel
+# Paths are relative to the current working directory
+org.eclipse.virgo.kernel.config=src/test/resources/config
+
+org.eclipse.virgo.medic.log.config.path=src/test/resources/config/serviceability.xml
+
+org.eclipse.gemini.web.tomcat.config.path=src/test/resources/config/tomcat-server.xml
+
+org.eclipse.virgo.kernel.deployer.disableRecovery=true
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/b.jar b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/b.jar
new file mode 100644
index 0000000..4e68452
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/b.jar
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/c.jar b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/c.jar
new file mode 100644
index 0000000..225c5c7
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/c.jar
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/management/keystore b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/management/keystore
new file mode 100644
index 0000000..bdd4dcd
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/management/keystore
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.apps.repository.properties b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.apps.repository.properties
new file mode 100644
index 0000000..1af97b4
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.apps.repository.properties
@@ -0,0 +1,6 @@
+integration-test.type=external
+integration-test.searchPattern=src/test/resources/hosted/*
+
+watched-integration-test.type=watched
+watched-integration-test.watchDirectory=src/test/resources/watched
+watched-integration-test.watchInterval=1
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.kernel.properties b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.kernel.properties
new file mode 100644
index 0000000..2f894c9
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.kernel.properties
@@ -0,0 +1,5 @@
+deployer.timeout=			300
+deployer.pickupDirectory=	target/pickup
+deployer.systemArtifacts=	repository:plan/org.eclipse.virgo.web.tomcat
+shell.enabled=				true
+shell.port=					2401
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.medic.properties b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.medic.properties
new file mode 100644
index 0000000..9a52283
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.medic.properties
@@ -0,0 +1,3 @@
+dump.root.directory=target/serviceability/dump
+log.wrapSysOut=true
+log.wrapSysErr=true
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.repository.properties b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.repository.properties
new file mode 100644
index 0000000..997d904
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/org.eclipse.virgo.repository.properties
@@ -0,0 +1,15 @@
+artifacts.type=external
+artifacts.searchPattern=../{bundle}/target/artifacts/*
+
+ivy-cache.type=external
+ivy-cache.searchPattern=${user.home}/virgo-build-cache/ivy-cache/repository/{org}/{name}/{version}/*
+
+remote.type=remote
+remote.uri=http://localhost:8080/org.eclipse.virgo.server.repository/integration-test
+remote.indexRefreshInterval=1
+
+remote-watched.type=remote
+remote-watched.uri=http://localhost:8080/org.eclipse.virgo.server.repository/watched-integration-test
+remote.indexRefreshInterval=1
+
+chain=artifacts,ivy-cache,remote,remote-watched
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/serviceability.xml b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/serviceability.xml
new file mode 100644
index 0000000..c44cff0
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/serviceability.xml
@@ -0,0 +1,57 @@
+<configuration>
+
+	<jmxConfigurator />
+
+	<appender name="LOG_STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-24.24thread %msg %ex%n</Pattern>
+		</encoder>
+	</appender>
+
+	<appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>target/serviceability/log/log.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<FileNamePattern>target/serviceability/log/log_%i.log</FileNamePattern>
+			<MinIndex>1</MinIndex>
+			<MaxIndex>4</MaxIndex>
+		</rollingPolicy>
+		<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<MaxFileSize>10MB</MaxFileSize>
+		</triggeringPolicy>
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-24.24thread %msg %ex%n</Pattern>
+		</encoder>
+	</appender>
+
+	<appender name="EVENT_LOG_STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-24.24thread &lt;%X{medic.eventCode}&gt; %msg %ex%n</Pattern>
+		</encoder>
+	</appender>
+
+	<appender name="EVENT_LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>target/serviceability/eventlog/eventlog.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<FileNamePattern>target/serviceability/eventlog/eventlog_%i.log</FileNamePattern>
+			<MinIndex>1</MinIndex>
+			<MaxIndex>4</MaxIndex>
+		</rollingPolicy>
+		<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<MaxFileSize>10MB</MaxFileSize>
+		</triggeringPolicy>
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-24.24thread &lt;%X{medic.eventCode}&gt; %msg %ex%n</Pattern>
+		</encoder>
+	</appender>
+
+	<logger name="org.eclipse.virgo.medic.eventlog.localized">
+		<appender-ref ref="EVENT_LOG_STDOUT" />
+		<appender-ref ref="EVENT_LOG_FILE" />
+	</logger>
+
+	<root level="INFO">
+		<!-- appender-ref ref="LOG_STDOUT" /-->
+		<appender-ref ref="LOG_FILE" />
+	</root>
+
+</configuration>
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/tomcat-server.xml b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/tomcat-server.xml
new file mode 100644
index 0000000..19a0533
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/config/tomcat-server.xml
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server>
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+  <Listener className="org.eclipse.virgo.web.tomcat.support.ServerLifecycleLoggingListener"/>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <Valve className="org.eclipse.virgo.web.tomcat.support.ApplicationNameTrackingValve"/>
+
+      <!-- Define the default virtual host -->
+      <Host name="localhost" deployOnStartup="false" autoDeploy="false"
+            unpackWARs="false" appBase="" createDirs="false">
+            <Listener className="org.eclipse.virgo.web.tomcat.support.ApplicationNameTrackingListener"/>
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/hosted/a.jar b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/hosted/a.jar
new file mode 100644
index 0000000..be7f1c7
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/hosted/a.jar
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/watched/.gitignore b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/watched/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/src/test/resources/watched/.gitignore
diff --git a/apps/org.eclipse.virgo.apps.repository.test/template.mf b/apps/org.eclipse.virgo.apps.repository.test/template.mf
new file mode 100644
index 0000000..a946fb9
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.test/template.mf
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Hosted Provisioning Repository Test
+Bundle-SymbolicName: org.eclipse.virgo.apps.repository.test
+Bundle-Version: ${version}
+Import-Template:
+ org.eclipse.virgo.kernel.*;version="${org.eclipse.virgo.kernel:[=.=.=, +1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, +1)}",
+ org.eclipse.virgo.repository.*;version="${version:[=.=.=, +1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, +1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, +1)}",
+ org.eclipse.gemini.web.*;version="${org.eclipse.gemini.web:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}",
+ org.junit.*;version="${org.junit:[=.=.=, +1)}",
+ org.osgi.framework.*;version="0",
+ javax.management.*;version="0",
+ org.slf4j.*;version="0"
+Excluded-Imports:
+ org.eclipse.virgo,
+ org.eclipse.virgo.kernel.equinox.extensions.hooks
diff --git a/apps/org.eclipse.virgo.apps.repository.web/.springBeans b/apps/org.eclipse.virgo.apps.repository.web/.springBeans
new file mode 100644
index 0000000..836d8d2
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.web/.springBeans
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.2.2.RC]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+		<config>src/main/resources/META-INF/spring/module-context.xml</config>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/apps/org.eclipse.virgo.apps.repository.web/src/main/java/org/eclipse/virgo/apps/repository/web/RepositoryController.java b/apps/org.eclipse.virgo.apps.repository.web/src/main/java/org/eclipse/virgo/apps/repository/web/RepositoryController.java
new file mode 100644
index 0000000..ae37067
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.web/src/main/java/org/eclipse/virgo/apps/repository/web/RepositoryController.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.web;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.util.FileCopyUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import org.eclipse.virgo.apps.repository.core.RepositoryIndex;
+import org.eclipse.virgo.apps.repository.core.RepositoryManager;
+
+@Controller
+class RepositoryController {
+    
+    private final RepositoryManager repositoryManager;
+    
+    private static final String INDEX_CONTENT_TYPE = "application/org.eclipse.virgo.repository.Index";
+    
+    private static final String ARTEFACT_CONTENT_TYPE = "application/octet-stream";
+    
+    private static final String IF_NONE_MATCH_HEADER_NAME = "If-None-Match";
+    
+    private static final String ETAG_HEADER_NAME = "Etag";
+    
+    RepositoryController(RepositoryManager repositoryManager) {
+        this.repositoryManager = repositoryManager;
+    }
+    
+    @RequestMapping(method = RequestMethod.GET, value = "/*")
+    void getIndex(HttpServletRequest request, HttpServletResponse response) throws IOException {        
+        String path = request.getRequestURI();
+        String repository = path.substring(path.lastIndexOf('/') + 1);
+        
+        RepositoryIndex index = this.repositoryManager.getIndex(repository);
+        if (index != null) {
+            String indexETag = index.getETag();
+            
+            String eTagHeader = request.getHeader(IF_NONE_MATCH_HEADER_NAME);
+            if (eTagHeader != null) {
+                String[] eTags = eTagHeader.split(",");
+                for (String eTag : eTags) {
+                    if (eTag.equals(indexETag)) {
+                        response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+                        return;
+                    }
+                }
+            }
+            
+            response.setContentType(INDEX_CONTENT_TYPE);
+            response.setContentLength(index.getLength());
+            response.addHeader(ETAG_HEADER_NAME, index.getETag());
+                                                
+            FileCopyUtils.copy(index.getInputStream(), response.getOutputStream());            
+        } else {
+            response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+    
+    @RequestMapping(method = RequestMethod.GET, value="/*/*/*/*")
+    void getArtifact(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        String requestUri = request.getRequestURI();
+        String[] uriComponents = requestUri.split("/");
+        
+        String repository = uriComponents[uriComponents.length - 4];
+        String type = uriComponents[uriComponents.length - 3];
+        String name = uriComponents[uriComponents.length - 2];
+        String version = uriComponents[uriComponents.length - 1];
+            
+        InputStream artefact = this.repositoryManager.getArtifact(repository, type, name, version);
+        if (artefact != null) {
+            response.setContentType(ARTEFACT_CONTENT_TYPE);
+            FileCopyUtils.copy(artefact, response.getOutputStream());
+        } else {
+            response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+        }                      
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.web/src/main/webapp/WEB-INF/applicationContext.xml b/apps/org.eclipse.virgo.apps.repository.web/src/main/webapp/WEB-INF/applicationContext.xml
new file mode 100644
index 0000000..28cc9a7
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.web/src/main/webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:osgi="http://www.springframework.org/schema/osgi"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<osgi:reference id="repositoryManager" interface="org.eclipse.virgo.apps.repository.core.RepositoryManager"/>
+
+</beans>
diff --git a/apps/org.eclipse.virgo.apps.repository.web/src/main/webapp/WEB-INF/hostedrepo-servlet.xml b/apps/org.eclipse.virgo.apps.repository.web/src/main/webapp/WEB-INF/hostedrepo-servlet.xml
new file mode 100644
index 0000000..0cf005e
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.web/src/main/webapp/WEB-INF/hostedrepo-servlet.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	
+	<bean id="controller" class="org.eclipse.virgo.apps.repository.web.RepositoryController">
+		<constructor-arg ref="repositoryManager"/>
+	</bean>
+
+</beans>
diff --git a/apps/org.eclipse.virgo.apps.repository.web/src/main/webapp/WEB-INF/web.xml b/apps/org.eclipse.virgo.apps.repository.web/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..f334d41
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.web/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app version="2.5"
+    xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://java.sun.com/xml/ns/javaee
+        http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+    <servlet>
+        <servlet-name>hostedrepo</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <load-on-startup>2</load-on-startup>                
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>hostedrepo</servlet-name>
+        <url-pattern>/*</url-pattern>
+    </servlet-mapping>
+    
+
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	
+	<context-param>
+		<param-name>contextClass</param-name>
+		<param-value>org.eclipse.virgo.web.dm.ServerOsgiBundleXmlWebApplicationContext</param-value>
+	</context-param>
+
+    <display-name>Virgo Hosted Repository Web application</display-name>
+
+    <description>Virgo Hosted Repository Web application</description>
+
+    
+</web-app>
diff --git a/apps/org.eclipse.virgo.apps.repository.web/src/test/java/org/eclipse/virgo/apps/repository/web/RepositoryControllerTests.java b/apps/org.eclipse.virgo.apps.repository.web/src/test/java/org/eclipse/virgo/apps/repository/web/RepositoryControllerTests.java
new file mode 100644
index 0000000..b3e4531
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.web/src/test/java/org/eclipse/virgo/apps/repository/web/RepositoryControllerTests.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2010 VMware Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   VMware Inc. - initial contribution
+ *******************************************************************************/
+
+package org.eclipse.virgo.apps.repository.web;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.eclipse.virgo.apps.repository.web.RepositoryController;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.eclipse.virgo.apps.repository.core.RepositoryIndex;
+import org.eclipse.virgo.apps.repository.core.RepositoryManager;
+
+public class RepositoryControllerTests {
+
+    private RepositoryManager repositoryManager;
+
+    private RepositoryController repositoryController;
+
+    @Before
+    public void setup() {
+        repositoryManager = createMock(RepositoryManager.class);
+        repositoryController = new RepositoryController(this.repositoryManager);
+    }
+
+    @Test
+    public void getIndex() throws Exception {
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        MockHttpServletResponse response = new MockHttpServletResponse();
+
+        request.setRequestURI("http://localhost:8080/org.eclipse.virgo.server.repository/my-repo");
+        request.setMethod("GET");
+
+        byte[] indexBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
+
+        RepositoryIndex repositoryIndex = createMock(RepositoryIndex.class);
+
+        try (InputStream indexBytesAsStream = new ByteArrayInputStream(indexBytes)) {
+            expect(repositoryIndex.getInputStream()).andReturn(indexBytesAsStream);
+            expect(repositoryIndex.getETag()).andReturn("123456789").anyTimes();
+            expect(repositoryIndex.getLength()).andReturn(indexBytes.length);
+            
+            expect(this.repositoryManager.getIndex("my-repo")).andReturn(repositoryIndex);
+            
+            replay(this.repositoryManager, repositoryIndex);
+            
+            repositoryController.getIndex(request, response);
+            
+            verify(this.repositoryManager, repositoryIndex);
+            
+            assertEquals("application/org.eclipse.virgo.repository.Index", response.getContentType());
+            assertArrayEquals(indexBytes, response.getContentAsByteArray());
+        }
+    }
+
+    @Test
+    public void getIndexForUnknownRepository() throws Exception {
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        MockHttpServletResponse response = new MockHttpServletResponse();
+
+        request.setRequestURI("http://localhost:8080/org.eclipse.virgo.server.repository/my-repo");
+        request.setMethod("GET");
+
+        expect(this.repositoryManager.getIndex("my-repo")).andReturn(null);
+
+        replay(this.repositoryManager);
+
+        repositoryController.getIndex(request, response);
+
+        verify(this.repositoryManager);
+
+        assertEquals(response.getStatus(), HttpServletResponse.SC_NOT_FOUND);
+    }
+
+    @Test
+    public void getArtefact() throws Exception {
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        MockHttpServletResponse response = new MockHttpServletResponse();
+
+        request.setRequestURI("http://localhost:8080/org.eclipse.virgo.server.repository/my-repo/bundle/com.foo/1.0.0");
+        request.setMethod("GET");
+
+        byte[] artefactBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
+
+        expect(this.repositoryManager.getArtifact("my-repo", "bundle", "com.foo", "1.0.0")).andReturn(new ByteArrayInputStream(artefactBytes));
+
+        replay(this.repositoryManager);
+
+        repositoryController.getArtifact(request, response);
+
+        verify(this.repositoryManager);
+
+        assertEquals("application/octet-stream", response.getContentType());
+        assertArrayEquals(artefactBytes, response.getContentAsByteArray());
+    }
+
+    @Test
+    public void getUnknownArtefact() throws Exception {
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        MockHttpServletResponse response = new MockHttpServletResponse();
+
+        request.setRequestURI("http://localhost:8080/org.eclipse.virgo.server.repository/my-repo/bundle/com.foo/1.0.0");
+        request.setMethod("GET");
+
+        expect(this.repositoryManager.getArtifact("my-repo", "bundle", "com.foo", "1.0.0")).andReturn(null);
+
+        replay(this.repositoryManager);
+
+        repositoryController.getArtifact(request, response);
+
+        verify(this.repositoryManager);
+
+        assertEquals(response.getStatus(), HttpServletResponse.SC_NOT_FOUND);
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.repository.web/template.mf b/apps/org.eclipse.virgo.apps.repository.web/template.mf
new file mode 100644
index 0000000..f3829e0
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.repository.web/template.mf
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Hosted Provisioning Repository Web Interface
+Bundle-SymbolicName: org.eclipse.virgo.apps.repository.web
+Bundle-Version: ${version}
+Bundle-ClassPath: WEB-INF/classes
+Web-ContextPath: org.eclipse.virgo.apps.repository
+Import-Template: 
+ org.eclipse.virgo.apps.repository.*;version="${version:[=.=.=, =.=.+1)}",
+ javax.servlet.*;version="${javaxServletVersion:[2.5.0,+1)}",
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.osgi.framework.*;version="0"
+Import-Package: 
+ org.springframework.web.context;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.springframework.web.servlet;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.eclipse.virgo.web.dm;version="${version:[=.=.=, +1)}",
+ org.springframework.beans.factory.xml;version="${springframeworkVersion:[2.5.6, +1)}"
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/java/org/eclipse/virgo/apps/splash/ContentServlet.java b/apps/org.eclipse.virgo.apps.splash/src/main/java/org/eclipse/virgo/apps/splash/ContentServlet.java
new file mode 100644
index 0000000..6cc67e6
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/java/org/eclipse/virgo/apps/splash/ContentServlet.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright 2004-2008 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.eclipse.virgo.apps.splash;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Scanner;
+import java.util.Set;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Special servlet to load static resources and render the admin HTML pages
+ * 
+ * @author Jeremy Grelle
+ * @author Scott Andrews
+ * @author Christopher Frost
+ */
+public class ContentServlet extends HttpServlet {
+
+    private static final Logger log = LoggerFactory.getLogger(ContentServlet.class);
+
+    private static final long serialVersionUID = 1L;
+
+    private static final String HTTP_CONTENT_LENGTH_HEADER = "Content-Length";
+
+    private static final String HTTP_LAST_MODIFIED_HEADER = "Last-Modified";
+
+    private static final String HTTP_EXPIRES_HEADER = "Expires";
+
+    private static final String HTTP_CACHE_CONTROL_HEADER = "Cache-Control";
+
+    private static final String PATH_TO_VERSION_FILE = "lib/.version";
+
+    private static final String VERSION_HOLDER = "<!--@<version@-->";
+
+    private String view = "/WEB-INF/splash.html";
+
+    private boolean gzipEnabled = true;
+
+    private final String version;
+
+    private int cacheTimeout = 60; // The number of seconds content should be cached by the client. Zero disables
+                                   // caching, 31556926 is one year.
+
+    private Map<String, String> defaultMimeTypes = new HashMap<String, String>();
+    {
+        defaultMimeTypes.put(".html", "text/html");
+        defaultMimeTypes.put(".htm", "text/html");
+        defaultMimeTypes.put(".xhtml", "text/html");
+    }
+
+    private Set<String> compressedMimeTypes = new HashSet<String>();
+    {
+        compressedMimeTypes.add("text/.*");
+        compressedMimeTypes.add(".*/xhtml.xml");
+    }
+
+    public ContentServlet() {
+        this.version = readServerVersion();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        URL resource = getRequestedContentURL(this.view);
+        prepareContentResponse(response, resource);
+        PrintWriter out = selectOutputStream(request, response);
+        try {
+            URLConnection resourceConn = resource.openConnection();
+            InputStream in = resourceConn.getInputStream();
+            try {
+                this.parse(in, out);
+            } finally {
+                in.close();
+            }
+        } finally {
+            out.close();
+        }
+    }
+
+    private void parse(InputStream in, PrintWriter out) {
+        try (Scanner scanner = new Scanner(in, StandardCharsets.UTF_8.name())) {
+            String parsedLine;
+            while (scanner.hasNextLine()) {
+                parsedLine = parseLine(scanner.nextLine());
+                if (parsedLine != null && !parsedLine.trim().isEmpty()) {
+                    out.append(parsedLine);
+                    out.append('\n');
+                }
+            }
+        }
+    }
+
+    private String parseLine(String line) {
+        if (line.contains(VERSION_HOLDER)) {
+            int offset = line.indexOf(VERSION_HOLDER);
+            line = String.format("%s%s%s", line.substring(0, offset), this.version, line.substring(offset + VERSION_HOLDER.length()));
+        }
+        return line;
+    }
+
+    private PrintWriter selectOutputStream(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        String acceptEncoding = request.getHeader("Accept-Encoding");
+        String mimeType = response.getContentType();
+        if (gzipEnabled && acceptEncoding != null && acceptEncoding.indexOf("gzip") > -1 && matchesCompressedMimeTypes(mimeType)) {
+            log.debug("Enabling GZIP compression for the current response.");
+            return new PrintWriter(new OutputStreamWriter(new GZIPResponseStream(response), StandardCharsets.UTF_8));
+        } else {
+            return response.getWriter();
+        }
+    }
+
+    private boolean matchesCompressedMimeTypes(String mimeType) {
+        for (String compressedMimeType : compressedMimeTypes) {
+            if (mimeType.matches(compressedMimeType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void prepareContentResponse(HttpServletResponse response, URL resource) throws IOException {
+        URLConnection resourceConn = resource.openConnection();
+        String mimeType = getServletContext().getMimeType(resource.getPath());
+        if (mimeType == null) {
+            String extension = resource.getPath().substring(resource.getPath().lastIndexOf('.'));
+            mimeType = (String) defaultMimeTypes.get(extension);
+        }
+        response.setContentType(mimeType);
+        response.setHeader(HTTP_CONTENT_LENGTH_HEADER, Long.toString(resourceConn.getContentLength()));
+        response.setDateHeader(HTTP_LAST_MODIFIED_HEADER, resourceConn.getLastModified());
+        if (cacheTimeout > 0) {
+            configureCaching(response, cacheTimeout);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected long getLastModified(HttpServletRequest request) {
+        String rawRequestPath = request.getPathInfo();
+        if (log.isDebugEnabled()) {
+            log.debug("Checking last modified of content: " + rawRequestPath);
+        }
+        URL resource;
+        try {
+            resource = getRequestedContentURL(rawRequestPath);
+        } catch (MalformedURLException e) {
+            return -1;
+        }
+        if (resource == null) {
+            return -1;
+        }
+        try {
+            return resource.openConnection().getLastModified();
+        } catch (IOException e) {
+            return -1;
+        }
+    }
+
+    private URL getRequestedContentURL(String rawRequestPath) throws MalformedURLException {
+        URL resource = getServletContext().getResource(rawRequestPath);
+        if (resource == null) {
+            if (log.isDebugEnabled()) {
+                log.debug("Content not found: " + rawRequestPath);
+            }
+        }
+        return resource;
+    }
+
+    /**
+     * Set HTTP headers to allow caching for the given number of seconds.
+     * 
+     * @param seconds number of seconds into the future that the response should be cacheable for
+     */
+    private void configureCaching(HttpServletResponse response, int seconds) {
+        response.setDateHeader(HTTP_EXPIRES_HEADER, System.currentTimeMillis() + seconds * 1000L); // HTTP 1.0 header
+        response.setHeader(HTTP_CACHE_CONTROL_HEADER, "max-age=" + seconds); // HTTP 1.1 header
+    }
+
+    private String readServerVersion() {
+        String readVersion;
+        File versionFile = new File(PATH_TO_VERSION_FILE);
+        Properties versions = new Properties();
+        InputStream stream = null;
+        try {
+            stream = new FileInputStream(versionFile);
+            versions.load(stream);
+            readVersion = versions.getProperty("virgo.server.version");
+            stream.close();
+        } catch (IOException e) {
+            readVersion = "";
+            try {
+                if (stream != null) {
+                    stream.close();
+                }
+            } catch (IOException e1) {
+                // no-op
+            }
+        }
+        return readVersion;
+    }
+}
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/java/org/eclipse/virgo/apps/splash/GZIPResponseStream.java b/apps/org.eclipse.virgo.apps.splash/src/main/java/org/eclipse/virgo/apps/splash/GZIPResponseStream.java
new file mode 100644
index 0000000..1b9a348
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/java/org/eclipse/virgo/apps/splash/GZIPResponseStream.java
@@ -0,0 +1,84 @@
+package org.eclipse.virgo.apps.splash;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.zip.GZIPOutputStream;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServletResponse;
+
+public class GZIPResponseStream extends ServletOutputStream {
+
+	private ByteArrayOutputStream byteStream = null;
+
+	private GZIPOutputStream gzipStream = null;
+
+	private boolean closed = false;
+
+	private HttpServletResponse response = null;
+
+	private ServletOutputStream servletStream = null;
+
+	public GZIPResponseStream(HttpServletResponse response) throws IOException {
+		super();
+		closed = false;
+		this.response = response;
+		this.servletStream = response.getOutputStream();
+		byteStream = new ByteArrayOutputStream();
+		gzipStream = new GZIPOutputStream(byteStream);
+	}
+
+	public void close() throws IOException {
+		if (closed) {
+			throw new IOException("This output stream has already been closed");
+		}
+		gzipStream.finish();
+
+		byte[] bytes = byteStream.toByteArray();
+
+		response.setContentLength(bytes.length);
+		response.addHeader("Content-Encoding", "gzip");
+		servletStream.write(bytes);
+		servletStream.flush();
+		servletStream.close();
+		closed = true;
+	}
+
+	public void flush() throws IOException {
+		if (closed) {
+			throw new IOException("Cannot flush a closed output stream");
+		}
+		gzipStream.flush();
+	}
+
+	public void write(int b) throws IOException {
+		if (closed) {
+			throw new IOException("Cannot write to a closed output stream");
+		}
+		gzipStream.write((byte) b);
+	}
+
+	public void write(byte b[]) throws IOException {
+		write(b, 0, b.length);
+	}
+
+	public void write(byte b[], int off, int len) throws IOException {
+		if (closed) {
+			throw new IOException("Cannot write to a closed output stream");
+		}
+		gzipStream.write(b, off, len);
+	}
+
+    @Override
+    public boolean isReady() {
+        // TODO implement javax.servlet 3.1 method
+        return false;
+    }
+
+    @Override
+    public void setWriteListener(WriteListener arg0) {
+        // TODO implement javax.servlet 3.1 method
+    }
+
+}
\ No newline at end of file
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/resources/.gitignore b/apps/org.eclipse.virgo.apps.splash/src/main/resources/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/resources/.gitignore
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/META-INF/.gitignore b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/META-INF/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/META-INF/.gitignore
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/META-INF/MANIFEST.MF b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..633dc89
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0

+Bundle-ClassPath: WEB-INF/classes

+Bundle-Version: 3.5.0

+Tool: Bundlor 1.1.0.BUILD-20101220120024

+Bundle-Name: Splash Screen

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.virgo.apps.splash

+Web-ContextPath: /

+Import-Package: org.eclipse.virgo.apps.splash

diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/WEB-INF/splash.html b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/WEB-INF/splash.html
new file mode 100644
index 0000000..fd58a88
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/WEB-INF/splash.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="en">
+
+	<head>
+		<title>Virgo Splash Screen</title>
+		<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+		<link rel="shortcut icon" href="images/favicon.ico" />
+		<link rel="stylesheet" href="styles/main.css" type="text/css" />
+		<link rel="stylesheet" href="styles/print.css" type="text/css" media="print" />
+	</head>
+	
+	<body class="main">
+	    <div id="page">
+	        <div id="mini-header">
+				<div id="mini-header-left"></div>
+				<div id="mini-header-right"></div>
+	        </div> <!-- /mini-header -->
+	
+	    <div id="primary-navigation">
+	        <div id="primary-left">
+	
+	        </div>
+	        <div id="left-cap"></div>
+	        <div id="primary-right">
+	            <ul>
+	                <li><a href="/admin" title="Admin Console">Admin Console</a></li>
+	            </ul>
+	        </div>
+	        <div id="right-cap"></div>
+	    </div><!-- /primary-navigation -->
+	
+	    <div id="container">
+	      <div id="content-no-nav">
+	
+	        <div id="splash-container"><img class="splash" src="images/server-splash.png" alt="EclipseRT Virgo Server" />
+	        	<div id="version-text"><!--@<version@--></div>
+	        </div>
+	        
+	        <h1>Welcome</h1>
+	        <p>
+	          Congratulations on installing the Virgo Server.
+	          From this splash page you can access the web-based <a href="/admin" title="Admin Console">admin console</a>.
+	        </p>
+	        
+	        <h1>Documentation</h1>
+	        <p>
+	          Documentation is available on-line for the server and related products.
+	        </p>
+	        <ul>
+	          <li><a href="http://www.eclipse.org/virgo/documentation" target="_blank" title="Eclipse Virgo Server Documentation">Eclipse Virgo Server Documentation</a>.</li>
+	          <li><a href="https://www.eclipse.org/gemini/blueprint/documentation/reference/2.0.0.RELEASE/html/index.html" target="_blank" title="Eclipse Gemini Blueprint Documentation">Eclipse Gemini Blueprint Documentation</a></li>
+	          <li><a href="http://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/" target="_blank" title="Spring Framework Documentation">Spring Framework Documentation</a></li>
+	        </ul>
+	      </div><!-- /content -->
+	    </div><!-- /container -->
+	    
+	    <div id="footer-wrapper">
+	      <div id="footer-left">&#169; Copyright 2008, 2011 VMware Inc. Licensed under the Eclipse Public License v1.0.</div>
+	
+	      <div id="footer-right"></div> 
+	    </div>
+	
+	  </div> <!-- /page-->
+	
+	</body>
+</html>
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/WEB-INF/web.xml b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..c71acd3
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+  <display-name>Virgo Splash Screen</display-name>
+  <description>Virgo Server - Splash Screen</description>
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+  <servlet>
+    <servlet-name>content</servlet-name>
+    <servlet-class>org.eclipse.virgo.apps.splash.ContentServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>content</servlet-name>
+    <url-pattern>/splash/*</url-pattern>
+  </servlet-mapping>
+</web-app>
\ No newline at end of file
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/favicon.ico b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/favicon.ico
new file mode 100755
index 0000000..e963685
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/favicon.ico
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/footer-left.png b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/footer-left.png
new file mode 100644
index 0000000..8bfe3b1
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/footer-left.png
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/footer-right.png b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/footer-right.png
new file mode 100644
index 0000000..51527ad
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/footer-right.png
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/footer-stretch.png b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/footer-stretch.png
new file mode 100644
index 0000000..c58f721
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/footer-stretch.png
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/header-left.png b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/header-left.png
new file mode 100644
index 0000000..4920a0a
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/header-left.png
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/header-right.png b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/header-right.png
new file mode 100644
index 0000000..09b0a59
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/header-right.png
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/menu-curve-left.png b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/menu-curve-left.png
new file mode 100644
index 0000000..c48a2e0
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/menu-curve-left.png
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/menu-curve-right.png b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/menu-curve-right.png
new file mode 100644
index 0000000..1f3b100
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/menu-curve-right.png
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/menu-stretch.png b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/menu-stretch.png
new file mode 100644
index 0000000..0ca66f7
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/menu-stretch.png
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/mini-header-left.png b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/mini-header-left.png
new file mode 100644
index 0000000..72551e7
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/mini-header-left.png
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/mini-header-right.png b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/mini-header-right.png
new file mode 100644
index 0000000..8aaf50c
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/mini-header-right.png
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/server-splash.png b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/server-splash.png
new file mode 100644
index 0000000..f8fe1f9
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/images/server-splash.png
Binary files differ
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/index.html b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/index.html
new file mode 100644
index 0000000..3f1e743
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title>Virgo Splash Screen</title>
+		<meta http-equiv="REFRESH" content="0;url=/splash">
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<link rel="shortcut icon" href="images/favicon.ico" />
+	</head>
+	<body>
+		<!-- No loading msg -->
+	</body>
+</html>
\ No newline at end of file
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/styles/main.css b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/styles/main.css
new file mode 100644
index 0000000..78e2927
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/styles/main.css
@@ -0,0 +1,223 @@
+/* 
+ *  Local style information for the Virgo Splash Screen
+ *
+ *  Contains both style and colour information.
+ *
+ *  Christopher Frost - March 2010
+ *
+ */
+ 
+body {
+	font: 12px Helvetica, Arial, "Bitstream Vera Sans", sans-serif;
+	background-color: #dfdfdf;
+}
+
+#page {
+	margin: auto;
+	width: 800px;
+	color: #333;
+}
+
+/*
+ * TEXT FORMATTING STYLES
+ */
+h1 {
+	font-size: 1.4em;
+	padding: 12px 0 5px 0;
+	line-height: 125%;
+	color: #002E62;
+	border-bottom: 1px solid #BAD9EC;
+}
+
+h2 {
+	font-size: 1.2em;
+	padding: 10px 0 2px 0;
+	color: #002E62;
+}
+
+/*
+ * LINK STYLES
+ */
+ 
+a:link, a:visited {
+	color: #333;
+	text-decoration: underline;
+}
+
+a:hover, a:focus {
+	color: #0093CF;
+	text-decoration: underline;
+}
+
+a:active, a.active { 
+	color: #0093CF;
+}
+  
+/*
+ * MENU STYLES
+ */
+#primary-navigation {
+	background: #fff url(../images/menu-stretch.png) repeat-x scroll 0 0;
+	height:29px;
+	margin:0;
+	padding:0;
+	position: relative;
+}
+
+#primary-left {
+	background: #002E62;
+	float: left;
+	height: 26px;
+	line-height: normal;
+	padding: 3px 0 0;
+	position: relative;
+}
+
+#primary-right {
+	background: #002E62;
+	float: right;
+	height: 26px;
+	line-height: normal;
+	padding: 3px 0 0;
+	position: relative;
+}
+
+#primary-left ul, #primary-right ul {
+	padding: 0 4px 0 4px;
+	margin: 2px 0 0 0;
+	list-style: none;
+}
+
+#primary-left li, #primary-right li {
+	display: inline;
+}
+
+#primary-left a, #primary-right a {
+	color: #ffffff;
+	display: block;
+	float: left;
+	font-weight:normal;
+	margin: 0 1px 0 1px;
+	padding: 7px 8px 4px 10px;
+	text-decoration: none;
+}
+
+#primary-left a:hover, #primary-right a:hover, .selected-menu {
+	background: #ffffff;
+	color:#002E62;
+	text-decoration: none;
+}
+
+#left-cap {
+	background: transparent url(../images/menu-curve-left.png) no-repeat top left;
+	height: 29px;
+	width: 30px;
+	float: left;
+}
+
+#right-cap {
+	background: transparent url(../images/menu-curve-right.png) no-repeat top right;
+	height: 29px;
+	width: 30px;
+	float: right;
+}
+
+/*
+ * CONTAINER STYLES
+ */
+#content-no-nav {
+	display: block;
+	margin: 0px 22px 20px 22px;
+	padding: 0;
+}
+ 
+#container {
+	margin: 0;
+	padding-bottom: 20px;
+	overflow:hidden;
+	background:#fff;
+}
+
+/*
+ * FOOTER STYLES
+ */
+#footer-wrapper {
+	clear: both;
+	margin: 0;
+	background-image: url(../images/footer-stretch.png);
+	background-repeat: repeat-x;
+	height: 29px;
+	width: 100%;
+}
+
+#footer-left, #footer-right {
+	margin: 0;
+	font-size: 85%;
+	padding: 1em;
+	height: 29px;
+    color: #bbb;
+}
+
+#footer-left {
+	text-align: left;
+	background-image: url(../images/footer-left.png);
+	background-repeat: no-repeat;
+	position: relative;
+	left: 0;
+	float: left;
+}
+
+#footer-right {
+	text-align: right;
+	background-image: url(../images/footer-right.png);
+	background-repeat: no-repeat;
+	background-position: top right;
+	position: relative;
+	right: 0;
+	float: right;
+}
+
+#footer-left a, #footer-right a {
+    color: #999;
+    text-decoration:none;
+}
+ 
+#mini-header, #mini-header-left, #mini-header-right {
+	height: 7px;
+	width: 7px;
+	margin: 0px;
+	padding: 0px;
+}
+
+#mini-header {
+	width: 100%;
+	background-color: #002e62; 
+}
+
+#mini-header-left {
+	background-image: url(../images/mini-header-left.png); 
+	background-repeat: no-repeat; 
+	background-position: left top;
+	float: left;
+}
+
+#mini-header-right {
+	background-image: url(../images/mini-header-right.png); 
+	background-repeat: no-repeat scroll; 
+	background-position: right top;
+	float: right;
+}
+ 
+#splash-container{
+	display: block;
+	margin: 30px auto;
+	width: 500px;
+}
+ 
+#version-text {
+ 	text-align: right;
+	font-size: 30px;
+	font-family: arial;
+	text-align: right;
+	color: #848589;
+}
diff --git a/apps/org.eclipse.virgo.apps.splash/src/main/webapp/styles/print.css b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/styles/print.css
new file mode 100644
index 0000000..3abe1c0
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/main/webapp/styles/print.css
@@ -0,0 +1,60 @@
+/* print.css 2008/04/22 nicolekonicki */
+
+/* White background, black text, arial font, decent font size */
+  body
+  {
+    background-color: #fff;
+    color: #000;
+    font-family: Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
+    font-size: 10pt;
+    width: 100%;
+  }
+
+/* Change the layout to remove columns */
+  html body
+  {
+    background: transparent;
+    width: auto;
+  }
+
+  #main, #container 
+  {
+    width: 100%;
+  }
+
+  #page
+  {
+    margin: 0;
+    width: 90%;
+  }
+  
+  #content
+  {
+  	margin:0;
+  	overflow:visible;
+  }
+
+
+/* Hide header and nav elements */
+  #header, #primary-navigation, #secondary-navigation, #footer-wrapper
+  {
+    visibility: hidden;
+    display: none;
+  }
+
+/* Style links */
+  a:link, a:visited
+  {
+    color: #520;
+    background: transparent;
+    text-decoration: underline !important;
+  }
+  
+/* Remove table header graphic */  
+  .bordered-table th
+  {
+  	background-image:none;
+  }
+  
+
+
diff --git a/apps/org.eclipse.virgo.apps.splash/src/test/java/META-INF/TEST.MF b/apps/org.eclipse.virgo.apps.splash/src/test/java/META-INF/TEST.MF
new file mode 100644
index 0000000..3ec0672
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/src/test/java/META-INF/TEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+

diff --git a/apps/org.eclipse.virgo.apps.splash/template.mf b/apps/org.eclipse.virgo.apps.splash/template.mf
new file mode 100644
index 0000000..31960e4
--- /dev/null
+++ b/apps/org.eclipse.virgo.apps.splash/template.mf
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-Name: Splash Screen
+Bundle-Version: ${version}
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.virgo.apps.splash
+Bundle-ClassPath: WEB-INF/classes
+Web-ContextPath: /
+Import-Template: 
+ javax.servlet.*;version="${javaxServletVersion:[2.5.0,+1)}",
+ org.slf4j;version="${slf4jVersion:[=.=.=,+1)}"
+Excluded-Exports: *
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..116523c
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,789 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+import virgobuild.Config
+
+apply plugin: virgobuild.VirgoToolsPlugin
+
+if (System.properties['eclipse.build'] == 'true') {
+    // https://gradle.org/docs/current/userguide/build_environment.html
+    // https://wiki.eclipse.org/Hudson#Why_use_a_Proxy.3F
+    println "Checking that proxy properties are set before proceeding..."
+    if (!System.properties['http.proxyHost'] && !System.properties['http.proxyPort']) {
+        throw new StopActionException("Properties 'http.proxyHost' and 'http.proxyPort' are both not set.")
+    }
+    println 'http.proxyHost = ' + System.properties['http.proxyHost']
+    println 'http.proxyPort = ' + System.properties['http.proxyPort']
+    println 'http.nonProxyHosts = ' + System.properties['http.nonProxyHosts']
+    println 'Done.'
+}
+
+buildscript {
+    repositories {
+        mavenLocal()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+        if (System.properties['local.build'] == 'true') {
+            jcenter()
+            maven { url 'https://repo.spring.io/libs-release' }
+        }
+    }
+    dependencies {
+        classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
+        if (System.properties['include.docs'] == 'true') {
+            // docbook processing
+            classpath 'net.sf.docbook:docbook-xsl:1.78.1:resources@zip'
+            // TODO use docbook 4.5 to reduce buildtime? 4.5 DTDs are not available locally?
+            // TODO alternatively switch to docbook 5.0?
+            classpath 'net.sf.docbook:docbook-xml:5.0:xsd-resources@zip'
+            classpath 'net.sf.docbook:docbook-xsl-saxon:1.0.0'
+            classpath 'org.apache.xerces:resolver:2.9.1'
+            classpath 'org.apache.xerces:xercesImpl:2.9.1'
+            classpath 'saxon:saxon:6.5.3'
+            classpath 'net.sf.xslthl:xslthl:2.0.1'
+            classpath 'org.apache.xmlgraphics:fop:0.95-1@jar'
+            classpath 'org.apache.xmlgraphics:xmlgraphics-commons:1.3'
+            classpath 'org.apache.xmlgraphics:batik-bridge:1.7@jar'
+            classpath 'org.apache.xmlgraphics:batik-util:1.7@jar'
+            classpath 'org.apache.xmlgraphics:batik-css:1.7@jar'
+            classpath 'org.apache.xmlgraphics:batik-dom:1.7'
+            classpath 'org.apache.xmlgraphics:batik-svg-dom:1.7@jar'
+            classpath 'org.apache.avalon.framework:avalon-framework-api:4.3.1'
+        }
+    }
+}
+
+def timestamp = new Date().format('yyyyMMddHHmmss', TimeZone.getTimeZone('GMT'))
+
+defaultTasks 'clean', 'jar', 'build', 'distZip'
+
+def Properties versions = new Properties()
+versions.load(new FileInputStream(project.rootProject.file('gradle.properties')))
+project.ext.props = versions
+
+allprojects() {
+    if (System.properties['ci.build'] == 'true') {
+        version = '3.7.2.D-' + timestamp
+    } else {
+        version = '3.7.2.RELEASE'
+    }
+}
+
+ext.appsProjects = [
+        project(':apps:org.eclipse.virgo.apps.repository.core'),
+        project(':apps:org.eclipse.virgo.apps.repository.web'),
+        project(':apps:org.eclipse.virgo.apps.splash'),
+]
+
+ext.kernelProjects = [
+        project(':kernel:org.eclipse.virgo.kernel.agent.dm'),
+        project(':kernel:org.eclipse.virgo.kernel.artifact'),
+        project(':kernel:org.eclipse.virgo.kernel.deployer'),
+        project(':kernel:org.eclipse.virgo.kernel.deployer.dm'),
+        project(':kernel:org.eclipse.virgo.kernel.dmfragment'),
+        project(':kernel:org.eclipse.virgo.kernel.equinox.extensions'),
+        project(':kernel:org.eclipse.virgo.kernel.kerneldmfragment'),
+        project(':kernel:org.eclipse.virgo.kernel.model'),
+        project(':kernel:org.eclipse.virgo.kernel.osgi'),
+        project(':kernel:org.eclipse.virgo.kernel.services'),
+        project(':kernel:org.eclipse.virgo.kernel.userregion'),
+        project(':kernel:org.eclipse.virgo.kernel.userregionfactory'),
+        project(':kernel:org.eclipse.virgo.management.console'),
+        project(':kernel:org.eclipse.virgo.management.fragment'),
+        project(':kernel:org.eclipse.virgo.shell.command'),
+]
+
+ext.medicProjects = [
+        project(':medic:org.eclipse.virgo.medic'),
+        project(':medic:org.eclipse.virgo.medic.core'),
+        project(':medic:org.eclipse.virgo.medic.logbackclassicfragment'),
+        project(':medic:org.eclipse.virgo.medic.logbackcorefragment'),
+]
+
+ext.nanoProjects = [
+        project(':nano:org.eclipse.virgo.nano.core'),
+        project(':nano:org.eclipse.virgo.nano.deployer'),
+        project(':nano:org.eclipse.virgo.nano.deployer.api'),
+        project(':nano:org.eclipse.virgo.nano.deployer.hot'),
+        project(':nano:org.eclipse.virgo.nano.management'),
+        project(':nano:org.eclipse.virgo.nano.management.controller'),
+        project(':nano:org.eclipse.virgo.nano.services.concurrent'),
+        project(':nano:org.eclipse.virgo.nano.services.ds'),
+]
+
+ext.repositoryProjects = [
+        project(':repository:org.eclipse.virgo.repository'),
+]
+
+ext.testUtils = [
+        project(':test:org.eclipse.virgo.test.stubs'),
+        project(':medic:org.eclipse.virgo.medic.test'),
+        project(':kernel:org.eclipse.virgo.kernel.stubs'),
+        project(':test:org.eclipse.virgo.test.tools'),
+]
+
+ext.utilProjects = [
+        project(':util:org.eclipse.virgo.util.common'),
+        project(':util:org.eclipse.virgo.util.env'),
+        project(':util:org.eclipse.virgo.util.io'),
+        project(':util:org.eclipse.virgo.util.jmx'),
+        project(':util:org.eclipse.virgo.util.math'),
+        project(':util:org.eclipse.virgo.util.osgi'),
+        project(':util:org.eclipse.virgo.util.osgi.manifest'),
+        project(':util:org.eclipse.virgo.util.parser.launcher'),
+        project(':util:org.eclipse.virgo.util.parser.manifest'),
+]
+
+ext.webProjects = [
+        project(':web:org.eclipse.virgo.web.core'),
+        project(':web:org.eclipse.virgo.web.dm'),
+        project(':web:org.eclipse.virgo.web.tomcat.support'),
+        project(':web:org.eclipse.virgo.web.enterprise.appdeployer'),
+        project(':web:org.eclipse.virgo.web.enterprise.applistener'),
+        project(':web:org.eclipse.virgo.web.enterprise.catalina.fragment.webbeans'),
+        project(':web:org.eclipse.virgo.web.enterprise.javax.persistence.extension'),
+        project(':web:org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer'),
+        project(':web:org.eclipse.virgo.web.enterprise.jsf.support'),
+        project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.bval'),
+        project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.jotm'),
+        project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.jpa'),
+        project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.webbeans'),
+        project(':web:org.eclipse.virgo.web.enterprise.openejb.initialiser'),
+        project(':web:org.eclipse.virgo.web.enterprise.openejb.jpa.integration'),
+        project(':web:org.eclipse.virgo.web.enterprise.openejb.tomcat.factory'),
+        project(':web:org.eclipse.virgo.web.enterprise.openwebbeans.initialiser'),
+        project(':web:org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook'),
+        project(':web:org.eclipse.virgo.web.enterprise.security'),
+        project(':web:org.eclipse.virgo.web.enterprise.security.openejb.classloading.hook'),
+        project(':web:org.eclipse.virgo.web.enterprise.security.valve'),
+        project(':web:org.eclipse.virgo.web.enterprise.services.accessor'),
+        project(':web:org.eclipse.virgo.web.servlet.adapter'),
+        project(':web:org.eclipse.virgo.web.spring.integration'),
+        project(':web:org.eclipse.virgo.web.war.deployer'),
+]
+
+ext.integrationTestProjects = [
+        project(':test:org.eclipse.virgo.test.launcher'),
+        project(':test:org.eclipse.virgo.test.framework'),
+
+        project(':util:org.eclipse.virgo.util.integrationtest'),
+        //	project(':medic:org.eclipse.virgo.medic.integrationtest'),
+]
+
+ext.smokeTestProjects = [
+        project(':packaging:nano:org.eclipse.virgo.nano.smoketest'),
+        project(':packaging:kernel:org.eclipse.virgo.kernel.smoketest'),
+        project(':packaging:jetty-server:org.eclipse.virgo.jetty.smoketest'),
+        project(':packaging:tomcat-server:org.eclipse.virgo.tomcat.smoketest'),
+]
+
+ext.javaProjects = ext.utilProjects + ext.medicProjects + ext.repositoryProjects + ext.nanoProjects + ext.kernelProjects + ext.webProjects + ext.appsProjects + ext.testUtils + ext.integrationTestProjects + smokeTestProjects +
+        [
+                project(':nano:org.eclipse.virgo.nano.authentication'),
+                project(':nano:org.eclipse.virgo.nano.shutdown'),
+        ]
+
+if (System.properties['local.build'] == 'true') {
+    ext.javaProjects += [
+            // project(':system-tests:org.eclipse.virgo.server.svt'),
+            // project(':performance-tests:org.eclipse.virgo.qa.performance'),
+    ]
+}
+
+ext.aspectjProjects = [
+        // these projects contain aspects
+        project(':util:org.eclipse.virgo.util.jmx'),
+        project(':test:org.eclipse.virgo.test.stubs'),
+        project(':medic:org.eclipse.virgo.medic'),
+        project(':nano:org.eclipse.virgo.nano.core'),
+        // these projects are woven
+        project(':kernel:org.eclipse.virgo.kernel.model'),
+        project(':kernel:org.eclipse.virgo.kernel.osgi'),
+]
+
+if (System.properties['local.build'] == 'true') {
+    if (System.properties['weaving.enabled'] == 'true') {
+        ext.aspectjProjects + [
+                project(':apps:org.eclipse.virgo.apps.repository.core'),
+                project(':kernel:org.eclipse.virgo.kernel.deployer'),
+                project(':kernel:org.eclipse.virgo.kernel.deployer.dm'),
+                project(':kernel:org.eclipse.virgo.kernel.dmfragment'),
+                project(':kernel:org.eclipse.virgo.shell.command'),
+                project(':repository:org.eclipse.virgo.repository'),
+                project(':web:org.eclipse.virgo.web.core'),
+                project(':web:org.eclipse.virgo.web.dm'),
+                project(':web:org.eclipse.virgo.web.tomcat.support'),
+        ]
+    }
+}
+
+/*
+ TODO - What about these modules? Do they have AspectJ nature in Eclipse?
+ aspectpath project(':nano:org.eclipse.virgo.nano.deployer.api')
+ aspectpath project(':nano:org.eclipse.virgo.nano.deployer.hot')
+ aspectpath project(':kernel:org.eclipse.virgo.kernel.services')
+ */
+
+ext.packagingProjects = [
+        project(':packaging:nano'),
+        project(':packaging:kernel'),
+        project(':packaging:jetty-server'),
+        project(':packaging:tomcat-server'),
+]
+
+ext {
+    // used when copying features and products
+    tokenMap = [
+            'VIRGO.VERSION'                : version,
+
+            'OSGI.SERVICES.VERSION'        : osgiServicesVersion, // used in oev.kernel.userregion.properties
+            'OSGI.ENTERPRISE.VERSION'      : osgiEnterpriseVersion,
+
+            'EQUINOX.HTTP.JETTY.VERSION'   : equinoxHttpJettyVersion,
+            'EQUINOX.APP.VERSION'          : equinoxAppVersion,
+            'EQUINOX.COMMON.VERSION'       : equinoxCommonVersion,
+            'EQUINOX.CONFIGADMIN.VERSION'  : equinoxCmVersion,
+            'EQUINOX.DS.VERSION'           : equinoxDsVersion,
+            'EQUINOX.SC.VERSION'           : equinoxSimpleConfiguratorVersion,
+            'EQUINOX.SC.M.VERSION'         : equinoxSimpleConfiguratorManipulatorVersion,
+            'EQUINOX.CONSOLE.VERSION'      : equinoxConsoleVersion,
+            'EQUINOX.CONSOLE.SSH.VERSION'  : equinoxConsoleSshVersion,
+            'EQUINOX.EVENT'                : equinoxEventVersion,
+            'EQUINOX.FRKA.E.VERSION'       : equinoxFrameworkadminEquinoxVersion,
+            'EQUINOX.FRKA.VERSION'         : equinoxFrameworkadminVersion,
+            'EQUINOX.PFRCS.VERSION'        : equinoxPreferencesVersion,
+            'REGION.VERSION'               : equinoxRegionVersion,
+            'EQUINOX.REGISTRY.VERSION'     : equinoxRegistryVersion,
+            'EQUINOX.SECURITY.VERSION'     : equinoxSecurityVersion,
+
+            'CONTENTTYPE.VERSION'          : eclipseCoreContenttypeVersion,
+            'JOBS.VERSION'                 : eclipseCoreJobsVersion,
+            'CORE.NET.VERSION'             : eclipseCoreNetVersion,
+            'CORE.VERSION'                 : eclipseCoreRuntimeVersion,
+
+            'ECF.FT.VERSION'               : eclipseEcfFiletransferVersion,
+            'ECF.I.VERSION'                : eclipseEcfIdentityVersion,
+            'ECF.P.FT.VERSION'             : eclipseEcfProviderFiletransferVersion,
+            'ECF.SSL.VERSION'              : eclipseEcfSslVersion,
+            'ECF.VERSION'                  : eclipseEcfVersion,
+
+            'MINA.CORE.VERSION'            : minaCoreVersion,
+            'SSHD.CORE.VERSION'            : apacheSshdCoreVersion,
+            'FELIX.GOGO.COMMAND.VERSION'   : gogoCommandVersion,
+            'FELIX.GOGO.RUNTIME.VERSION'   : gogoRuntimeVersion,
+            'FELIX.GOGO.SHELL.VERSION'     : gogoShellVersion,
+
+            'JOLOKIA.VERSION'              : jolokiaVersion,
+
+            'SPRING.VERSION'               : springframeworkVersion,
+
+            'GEMINI.MANAGEMENT.VERSION'    : geminiManagementVersion,
+            // TODO rename to 'GENIMI.BLUEPRINT.VERSION'
+            'SPRING.DM.VERSION'            : geminiBlueprintVersion,
+            'GEMINI.WEB.VERSION'           : geminiWebVersion,
+
+            'CATALINA.VERSION'             : apacheCatalinaVersion,
+
+            'ASPECTJ'                      : aspectjVersion,
+            'LOGBACK.CLASSIC.VERSION'      : logbackVersion,
+            'LOGBACK.CORE.VERSION'         : logbackVersion,
+            'SLF4J.API'                    : slf4jVersion,
+            'SLF4J.JCL'                    : slf4jVersion,
+            'SLF4J.LOG4J'                  : slf4jVersion,
+
+            'C.FILEUPLOAD.VERSION'         : commonsFileuploadVersion,
+            'C.IO.VERSION'                 : commonsIoVersion,
+
+            'SCANNOTATION'                 : scannotationVersion,
+            'JAVASSIST'                    : javassistVersion,
+            'JOTM'                         : jotmVersion,
+            'OBJECTWEB.ASM'                : objectwebAsmVersion,
+
+            'JAVAX.ACTIVATION'             : javaxActivationVersion,
+            'JAVAX.ANNOTATION'             : javaxAnnotationVersion,
+            'JAVAX.EJB'                    : javaxEjbVersion,
+            'JAVAX.EL'                     : javaxElVersion,
+            'JAVAX.INJECT'                 : javaxInjectVersion,
+            'JAVAX.JMS'                    : javaxJmsVersion,
+            'JAVAX.MAIL'                   : javaxMailVersion,
+            'JAVAX.PERSISTENCE'            : javaxPersistenceVersion,
+            'JAVAX.RESOURCE'               : javaxResourceVersion,
+            'JAVAX.SECURITY.AUTH'          : javaxSecurityAuthMessageVersion,
+            'JAVAX.SECURITY.JACC'          : javaxSecurityJaccVersion,
+            // TODO remove duplication 'JAVAX.SERVLET.VERSION' and 'JAVAX.SERVLET'
+            'JAVAX.SERVLET.VERSION'        : javaxServletVersion,
+            'JAVAX.SERVLET'                : javaxServletVersion,
+            'JAVAX.SERVLET.JSP'            : javaxServletJspVersion,
+            'JSTL.API'                     : javaxServletJspJstlApiVersion,
+            'JSTL.IMPL'                    : javaxServletJspJstlImplOsgiVersion,
+            'JAVAX.TRANSACTION'            : javaxTransactionVersion,
+            'JAVAX.VALIDATION'             : javaxValidationVersion,
+            'JAVAX.WEBSOCKET'              : javaxWebsocketVersion,
+            'JAVAX.WSDL'                   : javaxWsdlVersion,
+            'JAVAX.WS.RS'                  : javaxWsRsVersion,
+            'JAVAX.XML.RPC'                : javaxXmlRpcVersion,
+
+            'JETTY.VERSION'                : jettyVersion,
+            'RAP.RWT.VERSION'              : rapRwtVersion,
+            'RAP.RWT.OSGI.VERSION'         : rapRwtOsgiVersion,
+            'RAP.JFACE.VERSION'            : rapJfaceVersion,
+            'RAP.JFACE.DATABINDING.VERSION': rapJfaceDatabindingVersion,
+
+            'P2.A.R.VERSION'               : p2ArtifactRepositoryVersion,
+            'P2.CONSOLE.VERSION'           : p2ConsoleVersion,
+            'P2.CORE.VERSION'              : p2CoreVersion,
+            'P2.DIRECTOR.VERSION'          : p2DirectorVersion,
+            'P2.ENGINE.VERSION'            : p2EngineVersion,
+            'P2.GC.VERSION'                : p2GarbageCollectorVersion,
+            'P2.JP.VERSION'                : p2JarProcessorVersion,
+            'P2.METADATA.VERSION'          : p2MetadataVersion,
+            'P2.M.R.VERSION'               : p2MetadataRepositoryVersion,
+            'P2.PUBLISHER.VERSION'         : p2PublisherVersion,
+            'P2.P.E.VERSION'               : p2PublisherEclipseVersion,
+            'P2.REPOSITORY.VERSION'        : p2RepositoryVersion,
+            'P2.T.E.VERSION'               : p2TouchpointEclipseVersion,
+            'P2.T.N.VERSION'               : p2TouchpointNativesVersion,
+            'P2.T.ECF.VERSION'             : p2TransportEcfVersion,
+
+            'QUARTZ'                       : quartzVersion,
+            'WB.COMMON'                    : apacheOpenwebbeansVersion,
+            'WB.EE'                        : apacheOpenwebbeansEEVersion,
+            'WB.EJB'                       : apacheOpenwebbeansEEVersion,
+            'WB.IMPL'                      : apacheOpenwebbeansVersion,
+            'WB.SPI'                       : apacheOpenwebbeansVersion,
+            'WB.WEB'                       : apacheOpenwebbeansVersion,
+            'WB.JSF'                       : apacheOpenwebbeansVersion,
+            'WB.TOMCAT7'                   : apacheOpenwebbeansTomcat7Version,
+
+            'COMMOMS.BEANUTILS'            : commonsBeanutilsVersion,
+            'COMMONS.CLI'                  : commonsCliVersion,
+            'COMMONS.COLLECTIONS'          : commonsCollectionsVersion,
+            'COMMONS.DBCP'                 : commonsDbcpVersion,
+            'COMMONS.LANG'                 : commonsLangVersion,
+            'COMMONS.POOL'                 : commonsPoolVersion,
+
+            'BVAL'                         : apacheBvalVersion,
+            'G.CONNECTOR'                  : geronimoComponentsConnectorVersion,
+            'G.TRANSACTIONS'               : geronimoComponentsTransactionVersion,
+            'G.MANAGEMENT'                 : geronimoSpecsJ2eeManagementVersion,
+            'G.OSGI.LOCATOR'               : geronimoSpecsOsgiLocatorVersion,
+            'G.OSGI.REGISTRY'              : geronimoSpecsOsgiRegistryVersion,
+
+            'CDI.API'                      : cdiApiVersion,
+
+            'OE.API'                       : apacheOpenejbVersion,
+            'OE.CORE'                      : apacheOpenejbCoreVersion,
+            'OE.JAVAAGENT'                 : apacheOpenejbVersion,
+            'OE.JEE'                       : apacheOpenejbVersion,
+            'OE.LOADER'                    : apacheOpenejbVersion,
+            'OE.JPA.INTEGRATION'           : apacheOpenejbVersion,
+            'XB.ASM'                       : apacheXBeanAsmVersion,
+            'XB.BUNDLEUTILS'               : apacheXBeanBundleutilsVersion,
+            'XB.FINDER'                    : apacheXBeanFinderVersion,
+            'XB.NAMING'                    : apacheXBeanNamingVersion,
+            'XB.REFLECT'                   : apacheXBeanReflectVersion,
+            'EL.ANTLR'                     : eclipsePersistenceAntlrVersion,
+            'EL.ASM'                       : eclipsePersistenceAsmVersion,
+            'EL.CORE'                      : eclipsePersistenceCoreVersion,
+            'EL.JPA'                       : eclipsePersistenceJpaVersion,
+            'EL.JPQL'                      : eclipsePersistenceJpaJpqlVersion,
+            'FACES.API'                    : glassfishJavaxFacesVersion,
+            'FACES.IMPL'                   : glassfishComSunFacesVersion,
+
+            'DERBY'                        : apacheDerbyVersion,
+
+            // used in documentation
+            'project.name'                 : 'Virgo',
+            'runtime.category'             : 'EclipseRT',
+            'umbrella.product.name'        : 'Virgo Runtime Environment',
+            'umbrella.product.name.short'  : 'Virgo Runtime',
+            'tomcat.product.name'          : 'Virgo Server for Apache Tomcat',
+            'tomcat.product.name.short'    : 'VTS',
+            'jetty.product.name'           : 'Virgo Jetty Server',
+            'jetty.product.name.short'     : 'VJS',
+            'kernel.product.name'          : 'Virgo Kernel',
+            'kernel.product.name.short'    : 'VK',
+            'nano.product.name'            : 'Virgo Nano',
+            'nano.product.name.short'      : 'VN',
+            'nanoweb.product.name'         : 'Virgo Nano Web',
+            'snaps.product.name'           : 'Virgo Snaps',
+            'snaps.product.name.short'     : 'VS',
+            'ebr'                          : 'SpringSource Enterprise Bundle Repository',
+            'p2repo'                       : "http://download.eclipse.org/virgo/updatesite/${version}".toString(),
+            'bundle.version'               : "${version}".toString(),
+    ]
+}
+
+configure(javaProjects + aspectjProjects) {
+
+    apply plugin: 'java'
+    apply plugin: 'eclipse'
+
+    sourceCompatibility = '1.7'
+    targetCompatibility = '1.7'
+
+    compileJava {
+        options.encoding = 'utf-8'
+        options.fork = true
+        doFirst {
+            options.forkOptions.with {
+                executable = 'java'
+                jvmArgs = [
+                        '-cp',
+                        configurations.ecj.asPath,
+                        'org.eclipse.jdt.internal.compiler.batch.Main',
+                        '-warn:-unused'
+                ]
+            }
+        }
+    }
+    compileTestJava {
+        options.encoding = 'utf-8'
+        options.fork = true
+        doFirst {
+            options.forkOptions.with {
+                executable = 'java'
+                jvmArgs = [
+                        '-cp',
+                        configurations.ecj.asPath,
+                        'org.eclipse.jdt.internal.compiler.batch.Main',
+                        '-warn:-unused'
+                ]
+            }
+        }
+    }
+
+    test {
+        if (System.properties['ci.build'] == 'true') {
+            ignoreFailures = true
+        }
+    }
+
+    configurations { ecj {} }
+
+    dependencies {
+        ecj group: "org.eclipse.jdt.core.compiler", name: "ecj", version: ecjVersion
+
+        testCompile group: 'junit', name: 'junit', version: junitVersion, configuration: "compile", ext: "jar"
+        testRuntime group: 'org.eclipse.virgo.mirrored', name: "org.apache.commons.logging", version: commonsLoggingVersion, ext: "jar"
+    }
+
+    eclipse {
+        jdt {
+            sourceCompatibility = 1.7
+            targetCompatibility = 1.7
+        }
+    }
+}
+
+configure(ext.utilProjects + ext.medicProjects + ext.repositoryProjects + ext.nanoProjects + ext.kernelProjects + ext.webProjects + ext.appsProjects) {
+    assemble.doLast {
+        println '|--> Assembled Jar File: ' + jar.archivePath
+        if (System.properties['ci.build.signjars'] == 'true') {
+            println '|--> Normalize Jar File: ' + jar.archivePath
+            project.javaexec {
+                main = 'org.eclipse.equinox.internal.p2.jarprocessor.Main'
+                classpath Config.on(project).jarProcessorJar
+                args = [
+                        '-repack',
+                        jar.archivePath
+                ]
+            }
+            println '|--> Signing Jar File: ' + jar.archivePath
+            exec {
+                workingDir jar.destinationDir
+                commandLine 'curl',
+                        '-o',
+                        jar.archivePath,
+                        '-F',
+                        "file=@${jar.archivePath}",
+                        '--show-error',
+                        'http://build.eclipse.org:31338/sign'
+            }
+            println '|--> Compress Jar File: ' + jar.archivePath
+            project.javaexec {
+                main = 'org.eclipse.equinox.internal.p2.jarprocessor.Main'
+                classpath Config.on(project).jarProcessorJar
+                args = [
+                        '-pack',
+                        jar.archivePath
+                ]
+            }
+        } else {
+            println '|--> Skipping normalize/signing/compression of Jar File: ' + jar.archivePath
+        }
+    }
+}
+
+configure(javaProjects) {
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
+    }
+
+    artifacts {
+        archives sourcesJar
+    }
+}
+
+configure(javaProjects) {
+    apply plugin: 'maven-publish'
+    publishing {
+        repositories {
+            maven {
+                name = "BuildEclipseOrg"
+                url "/opt/public/rt/virgo/gradle/bundles"
+            }
+        }
+        publications {
+            virgo(MavenPublication) {
+                groupId 'org.eclipse.virgo'
+                from components.java
+                artifact sourcesJar {
+                    classifier "sources"
+                }
+            }
+        }
+    }
+}
+
+configure(javaProjects + aspectjProjects + packagingProjects + project(":org.eclipse.virgo.site")) {
+    repositories {
+        mavenCentral()
+        ivy {
+            url "http://build.eclipse.org/rt/virgo/ivy/bundles/release/"
+            layout "pattern", { artifact "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" }
+        }
+        ivy {
+            url "http://build.eclipse.org/rt/virgo/ivy/bundles/milestone/"
+            layout "pattern", { artifact "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" }
+        }
+    }
+}
+
+configure(javaProjects) {
+    if (System.properties['ci.build'] == 'true' || System.properties['include.findbugs'] == 'true') {
+        apply plugin: 'findbugs'
+
+        findbugs {
+            toolVersion = "3.0.1"
+            sourceSets = [sourceSets.main]
+            ignoreFailures = true
+            effort = "max"
+            reportLevel = "high"
+            excludeFilter = file("$rootProject.projectDir/config/findbugs/excludeFilter.xml")
+        }
+    }
+}
+
+configure(javaProjects) {
+    if (System.properties['ci.build'] == 'true' || System.properties['include.jacoco'] == 'true') {
+        apply plugin: "jacoco"
+
+        jacoco { toolVersion = "0.7.4.201502262128" }
+    }
+}
+
+configure(packagingProjects) {
+    configurations {
+        aspects { // visibility="private"
+            description = "Aspects to be woven"
+        }
+
+        nanoLib {
+            description = "Dependencies to be packaged in lib"
+            transitive = true
+            exclude module: "org.eclipse.osgi"
+        }
+        nanoLibEndorsed { description = "Dependencies to be packaged in endorsed" }
+        nanoLibPersistence {
+            transitive = false
+            description = "Dependencies to be packaged in lib/persistence"
+        }
+        nanoPickup {
+            transitive = false
+            description = "Dependencies to be packaged in pickup"
+        }
+        kernelPluginsExtras {
+            transitive = false
+            description = "Dependencies to be published without p2 into Kernel plugin directory"
+        }
+        repositoryExt {
+            transitive = false
+            description = "Dependencies to be packaged in repository/ext"
+        }
+    }
+}
+
+ext.wabProjects = [
+        project(':apps:org.eclipse.virgo.apps.splash'),
+        project(':kernel:org.eclipse.virgo.management.console'),
+]
+
+configure(utilProjects + medicProjects + repositoryProjects + nanoProjects + kernelProjects + webProjects + appsProjects) {
+
+    apply plugin: 'org.eclipse.virgo.bundlor'
+
+    task('addProjectVersionToGradlePropertiesTask', type: Copy) {
+        ext.outputDir = new File(buildDir, 'bundlor-properties')
+        inputs.file project.rootProject.file('gradle.properties')
+        outputs.dir ext.outputDir
+        from project.rootProject.file('gradle.properties')
+        into ext.outputDir
+        filter(ReplaceTokens, tokens: [
+                'VIRGO.VERSION': version,
+        ])
+    }
+
+    task('mergeClassesAndResources', type: Copy, dependsOn: 'compileJava') {
+        ext.bundlorInputPath = new File(buildDir, 'bundlor-inputPath')
+        inputs.file sourceSets.main.output.classesDir
+        inputs.file sourceSets.main.resources
+        outputs.dir ext.bundlorInputPath
+        from sourceSets.main.output.classesDir
+        from sourceSets.main.resources
+        into ext.bundlorInputPath
+    }
+
+    project.tasks.'bundlor'.dependsOn('addProjectVersionToGradlePropertiesTask', 'mergeClassesAndResources')
+
+    bundlor {
+        ext.bundlorInputPath = new File(buildDir, 'bundlor-inputPath')
+        project.tasks['bundlor'].inputs.file ext.bundlorInputPath
+        manifestTemplatePath = "template.mf"
+        propertiesPath = new File("${project.buildDir}/bundlor-properties/gradle.properties")
+        inputPath = ext.bundlorInputPath
+        failOnWarnings = false
+    }
+}
+
+configure(wabProjects) {
+    apply plugin: 'war'
+
+    war.dependsOn('bundlor')
+
+    war {
+        extension = 'jar'
+        rootSpec.exclude("**/*.jar")
+        manifest = project.manifest { from 'build/bundlor/META-INF/MANIFEST.MF' }
+    }
+}
+
+configure(aspectjProjects) {
+    configurations.compile.dependencies.each { dep ->
+        if (dep.hasProperty("dependencyProject")) {
+            println "dependent project: ${dep}"
+            iajcClasspath += ":" + dep.dependencyProject.buildDir + "/bundles/release/classes.jar"
+        } else {
+            println "other dependency: ${dep}"
+        }
+    }
+
+    configurations {
+        ajtools {
+            transitive = false
+            description = "AspectJ tools runtime"
+        }
+
+        aspectpath {
+            transitive = false
+            description = "Aspects are applied to types present in the project"
+        }
+
+        testAspectpath {
+            transitive = false
+            description = "Aspects are applied to tests present in the project"
+        }
+    }
+
+    dependencies {
+        compile "org.aspectj:aspectjrt:${project.aspectjVersion}"
+        ajtools "org.aspectj:aspectjtools:${project.aspectjVersion}"
+    }
+
+    apply plugin: aspectj.AspectJPlugin
+
+    // Add nature and buildCommand
+    eclipse.project {
+        natures 'org.eclipse.ajdt.ui.ajnature'
+        buildCommand 'org.eclipse.ajdt.core.ajbuilder'
+    }
+
+    eclipse {
+        classpath {
+            file {
+                withXml { xmlProvider ->
+                    def classpath = xmlProvider.asNode()
+                    def xmlparser = new XmlParser()
+                    configurations.aspectpath.dependencies.each { dep ->
+                        if (dep.hasProperty("dependencyProject")) {
+                            println "Name of project containing aspects to weave: " + dep.dependencyProject.name
+                            classpath.children().findAll { it['@path'] == '/' + dep.dependencyProject.name }.each {
+                                println "Adding ${it['@path']} to Aspect Path"
+                                def attrs = xmlparser.createNode(it, 'attributes', [:])
+                                xmlparser.createNode(attrs, 'attribute', [name: 'org.eclipse.ajdt.aspectpath', value: 'org.eclipse.ajdt.aspectpath']);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+configure(testUtils) {
+    dependencies {
+        // changing junit dependency to configuration compile - this is a test util project based on JUnit :)
+        compile group: 'junit', name: 'junit', version: junitVersion
+    }
+}
+
+configure(integrationTestProjects) {
+    dependencies {
+        // OSGi runtime
+        testRuntime group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+
+        testCompile group: "org.eclipse.virgo.mirrored", name: "javax.inject", version: javaxInjectVersion, configuration: "compile", ext: "jar"
+
+        // PaxExam
+        testRuntime group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
+        testCompile group: "org.ops4j.pax.exam", name: "pax-exam-junit4", version: paxExamJunit4Version
+        testRuntime group: "org.ops4j.pax.exam", name: "pax-exam-container-native", version: paxExamContainerNativeVersion
+        testRuntime group: "org.ops4j.pax.exam", name: "pax-exam-link-mvn", version: paxExamLinkMvnVersion
+        testRuntime group: "org.ops4j.pax.url", name: "pax-url-aether", version: paxUrlAetherVersion
+        testRuntime group: "org.ops4j.pax.url", name: "pax-url-aether", version: paxUrlAetherVersion
+        testRuntime group: "org.ops4j.pax.url", name: "pax-url-wrap", version: paxUrlWrapVersion
+    }
+}
+
+configure(smokeTestProjects) {
+    sourceSets {
+        smokeTest {
+            java.srcDir file('src/smokeTest/java')
+            resources.srcDir file('src/smokeTest/resources')
+        }
+    }
+
+    task smokeTest(type: Test) {
+        testClassesDir = sourceSets.smokeTest.output.classesDir
+        classpath = sourceSets.smokeTest.runtimeClasspath
+    }
+
+    dependencies {
+        testCompile project(':test:org.eclipse.virgo.test.tools')
+        testCompile project(':util:org.eclipse.virgo.util.io')
+
+        testRuntime group: "org.apache.httpcomponents", name: "httpcore", version: httpcomponentsCoreVersion
+        testRuntime group: "org.apache.httpcomponents", name: "httpclient", version: httpcomponentsClientVersion
+
+        smokeTestCompile sourceSets.main.output
+        smokeTestCompile configurations.testCompile
+        smokeTestCompile sourceSets.test.output
+        smokeTestRuntime configurations.testRuntime
+    }
+}
+
+task wrapper(type: Wrapper) {
+    description 'Creates a local Gradle Wrapper'
+    group = 'Build Setup'
+    gradleVersion = '3.5' // CQ 13634
+}
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 0000000..1b1f1e3
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'maven'
+apply plugin: 'groovy'
+
+repositories {
+    if (System.properties['local.build'] == 'true') {
+        mavenCentral()
+        maven { url 'https://repo.spring.io/libs-release' }
+    }
+}
+
+dependencies {
+    compile gradleApi()
+    compile localGroovy()
+
+    if (System.properties['local.build'] == 'true') {
+        compile 'net.sf.docbook:docbook-xsl:1.78.1:resources@zip'
+        compile 'net.sf.docbook:docbook-xml:5.0:xsd-resources@zip'
+        compile 'net.sf.docbook:docbook-xsl-saxon:1.0.0'
+        compile 'org.apache.xerces:resolver:2.9.1'
+        compile 'org.apache.xerces:xercesImpl:2.9.1'
+        compile 'saxon:saxon:6.5.3'
+        compile 'net.sf.xslthl:xslthl:2.0.1'
+        compile 'org.apache.xmlgraphics:fop:0.95-1@jar'
+        compile 'org.apache.xmlgraphics:xmlgraphics-commons:1.3'
+        compile 'org.apache.xmlgraphics:batik-bridge:1.7@jar'
+        compile 'org.apache.xmlgraphics:batik-util:1.7@jar'
+        compile 'org.apache.xmlgraphics:batik-css:1.7@jar'
+        compile 'org.apache.xmlgraphics:batik-dom:1.7'
+        compile 'org.apache.xmlgraphics:batik-svg-dom:1.7@jar'
+        compile 'org.apache.avalon.framework:avalon-framework-api:4.3.1'
+    }
+}
diff --git a/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy b/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy
new file mode 100644
index 0000000..509fef9
--- /dev/null
+++ b/buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy
@@ -0,0 +1,79 @@
+package aspectj
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.file.FileCollection
+import org.gradle.api.logging.LogLevel
+import org.gradle.api.plugins.JavaPlugin
+import org.gradle.api.tasks.SourceSet
+import org.gradle.api.tasks.TaskAction
+
+class AspectJPlugin implements Plugin<Project> {
+
+    void apply(Project project) {
+        project.plugins.apply(JavaPlugin)
+
+        for (projectSourceSet in project.sourceSets) {
+            if (!projectSourceSet.allJava.isEmpty()) {
+                def aspectTaskName = "compileAspect"
+                def javaTaskName = "compileJava"
+                def configurationName = "aspectpath"
+                if (!projectSourceSet.name.equals('main')) {
+                    aspectTaskName = "compile${projectSourceSet.name.capitalize()}Aspect"
+                    javaTaskName = "compile${projectSourceSet.name.capitalize()}Java"
+                    configurationName = "${projectSourceSet.name}Aspectpath"
+                }
+
+                project.tasks.create(name: aspectTaskName, overwrite: true, description: "Compiles AspectJ Source for ${projectSourceSet.name} source set", type: Ajc) {
+                    sourceSet = projectSourceSet
+                    inputs.files(sourceSet.allJava)
+                    outputs.dir(sourceSet.output.classesDir)
+                    aspectpath = project.configurations.findByName(configurationName)
+                }
+
+                project.tasks[aspectTaskName].setDependsOn(project.tasks[javaTaskName].dependsOn)
+                project.tasks[aspectTaskName].dependsOn(project.tasks[aspectTaskName].aspectpath)
+                project.tasks[javaTaskName].deleteAllActions()
+                project.tasks[javaTaskName].dependsOn(project.tasks[aspectTaskName])
+            }
+        }
+    }
+}
+
+class Ajc extends DefaultTask {
+
+    SourceSet sourceSet
+
+    FileCollection aspectpath
+
+    Ajc() {
+        logging.captureStandardOutput(LogLevel.INFO)
+    }
+
+    @TaskAction
+    def compile() {
+        def iajcArgs = [
+            classpath           : sourceSet.compileClasspath.asPath,
+            destDir             : sourceSet.output.classesDir.absolutePath,
+            source              : '1.7',
+            target              : '1.7',
+            aspectPath          : aspectpath.asPath,
+            sourceRootCopyFilter: '**/*.java,**/*.aj',
+            showWeaveInfo       : 'true',
+            debug               : 'true',
+            debugLevel          : 'lines,vars,source',
+            checkRuntimeVersion : 'false',
+            X                   : '',
+        ]
+
+        ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties", classpath: project.configurations.ajtools.asPath)
+        ant.iajc(iajcArgs) {
+            sourceRoots {
+                sourceSet.java.srcDirs.each {
+                    pathelement(location: it.absolutePath)
+                }
+            }
+        }
+    }
+}
diff --git a/buildSrc/src/main/groovy/docbook/Docbook.groovy b/buildSrc/src/main/groovy/docbook/Docbook.groovy
new file mode 100644
index 0000000..54000d2
--- /dev/null
+++ b/buildSrc/src/main/groovy/docbook/Docbook.groovy
@@ -0,0 +1,269 @@
+package docbook
+//
+//import org.apache.fop.apps.Fop
+//import org.apache.fop.apps.FopFactory
+//import org.apache.fop.apps.MimeConstants
+//
+//import java.io.File
+//
+//import javax.xml.parsers.SAXParserFactory
+//import javax.xml.transform.Result
+//import javax.xml.transform.Source
+//import javax.xml.transform.Transformer
+//import javax.xml.transform.TransformerFactory
+//import javax.xml.transform.sax.SAXSource
+//import javax.xml.transform.sax.SAXResult
+//import javax.xml.transform.stream.StreamResult
+//import javax.xml.transform.stream.StreamSource
+//
+//import org.apache.tools.ant.filters.ReplaceTokens
+//import org.apache.xml.resolver.CatalogManager
+//import org.apache.xml.resolver.tools.CatalogResolver
+//import org.gradle.api.DefaultTask
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+//import org.gradle.api.tasks.OutputDirectory
+//import org.gradle.api.tasks.TaskAction
+//import org.xml.sax.InputSource
+//import org.xml.sax.XMLReader
+//
+//import com.icl.saxon.TransformerFactoryImpl
+//
+class Docbook implements Plugin<Project> {
+
+    public void apply(Project project) {
+//        project.extensions.create("docbook", DocbookExtension)
+//        project.docbook.with {
+//        }
+//
+//        project.plugins.apply('base')
+//
+//        project.configurations { docbook }
+//
+//        project.repositories.mavenCentral()
+//
+//        project.dependencies {
+//            docbook 'net.sf.docbook:docbook-xsl:1.78.1:resources@zip'
+//            docbook 'net.sf.docbook:docbook-xml:5.0:xsd-resources@zip'
+//        }
+//
+//        def tasks = project.tasks
+//
+//        def prepareDocbookResources = tasks.create("prepareDocbookResources", PrepareDocbookResources)
+//        def prepareDocSources = tasks.create("prepareDocSources", PrepareDocSources)
+//        prepareDocSources.dependsOn([prepareDocbookResources])
+//
+//        def single = tasks.create("referenceHtmlSingle", DocbookReferenceTask)
+//        single.dependsOn([prepareDocSources])
+//        single.description('Generates single-page HTML documentation.')
+//        single.customStylesheetLocation = "html/custom.xsl"
+//        single.outputFormat = 'html-single'
+//        single.extension = 'html'
+//
+//        def multi = tasks.create("referenceHtmlMulti", DocbookReferenceTask)
+//        multi.dependsOn([prepareDocSources])
+//        multi.description('Generates multi-page HTML documentation.')
+//        multi.customStylesheetLocation = "html-multi/custom.xsl"
+//        multi.outputFormat = 'html-multi'
+//        multi.extension = 'html'
+//
+//        def fo = tasks.create("referenceFo", DocbookReferenceTask)
+//        fo.dependsOn([prepareDocSources])
+//        fo.description('Generates FO intermediate documentation.')
+//        fo.customStylesheetLocation = "fo/custom.xsl"
+//        fo.outputFormat = 'pdf'
+//        fo.extension = 'fo'
+//
+//        def pdf = tasks.create("referencePdf", FopTask)
+//        pdf.dependsOn([fo])
+//        pdf.description('Generates PDF documentation.')
+//
+//        def reference = tasks.create("reference") {
+//            group = 'Documentation'
+//            description = "Generates HTML and PDF reference documentation."
+//            dependsOn([single, multi, pdf])
+//            outputs.dir new File(project.buildDir, "reference")
+//        }
+    }
+}
+//
+//class PrepareDocbookResources extends DefaultTask {
+//
+//    @OutputDirectory
+//    File outputDir = new File(project.getBuildDir(), "docbook")
+//
+//    @TaskAction
+//    public final void prepareDocbookResources() {
+//        File docbookZip = project.configurations.docbook.files.find { File file -> file.name.contains('docbook-xsl-')};
+//
+//        project.copy {
+//            from project.zipTree(docbookZip)
+//            include 'docbook/**'
+//            into project.getBuildDir()
+//        }
+//    }
+//}
+//
+//class PrepareDocSources extends DefaultTask {
+//
+//    @OutputDirectory
+//    File outputDir = new File(project.getBuildDir(), "work")
+//
+//    @TaskAction
+//    public final void prepareDocSources() {
+//        def version = project.docbook.version
+//        def tokenMap = [
+//            'project.name': 'Virgo',
+//            'runtime.category': 'EclipseRT',
+//            'umbrella.product.name': 'Virgo Runtime Environment',
+//            'umbrella.product.name.short': 'Virgo Runtime',
+//            'tomcat.product.name': 'Virgo Server for Apache Tomcat',
+//            'tomcat.product.name.short': 'VTS',
+//            'jetty.product.name': 'Virgo Jetty Server',
+//            'jetty.product.name.short': 'VJS',
+//            'kernel.product.name': 'Virgo Kernel',
+//            'kernel.product.name.short': 'VK',
+//            'nano.product.name': 'Virgo Nano',
+//            'nano.product.name.short': 'VN',
+//            'nanoweb.product.name': 'Virgo Nano Web',
+//            'snaps.product.name': 'Virgo Snaps',
+//            'snaps.product.name.short': 'VS',
+//            'ebr': 'SpringSource Enterprise Bundle Repository',
+//            'p2repo': "http://download.eclipse.org/virgo/updatesite/${version}".toString(),
+//            'bundle.version': "${version}".toString(),
+//        ]
+//
+//        project.copy {
+//            from project.file(project.docbook.docSourceDirName)
+//            into outputDir
+//            filter(ReplaceTokens, tokens: tokenMap)
+//        }
+//        // copy DocBook images and...
+//        project.copy {
+//            from "${project.buildDir}/docbook/images"
+//            into new File(outputDir, 'images')
+//        }
+//        // project images.
+//        project.copy {
+//            from project.file(project.docbook.imageSourceDirName)
+//            into new File(outputDir, 'images')
+//        }
+//    }
+//}
+//
+//class DocbookReferenceTask extends DefaultTask {
+//
+//    File inputDir
+//
+//    File outputDir
+//
+//    String customStylesheetLocation
+//
+//    String outputFormat
+//
+//    String extension
+//
+//    @OutputDirectory
+//    File outputBaseDir = new File(project.getBuildDir(), "reference")
+//
+//    @TaskAction
+//    public final void transform() {
+//        inputDir = new File(project.buildDir, 'work')
+//        outputDir = new File(outputBaseDir, outputFormat)
+//
+//        SAXParserFactory factory = new org.apache.xerces.jaxp.SAXParserFactoryImpl()
+//        factory.setXIncludeAware(true)
+//
+//        CatalogResolver resolver = new CatalogResolver(createCatalogManager())
+//
+//        TransformerFactory transformerFactory = new TransformerFactoryImpl()
+//        transformerFactory.setURIResolver(resolver)
+//
+//        File stylesheetFile = new File(inputDir, "styles/${customStylesheetLocation}")
+//        URL url = stylesheetFile.toURI().toURL()
+//
+//        Transformer transformer = transformerFactory.newTransformer(new StreamSource(url.openStream(), url.toExternalForm()))
+//        transformer.setParameter("highlight.source", "1")
+//        transformer.setParameter("highlight.xslthl.config", new File("${project.buildDir}/docbook/highlighting", "xslthl-config.xml").toURI().toURL())
+//        transformer.setParameter("root.filename", project.docbook.baseName)
+//        transformer.setParameter("base.dir", outputDir)
+//
+//        File inputFile = new File(inputDir, "${project.docbook.baseName}.xml")
+//        File outputFile = new File(outputDir, "${project.docbook.baseName}.${extension}")
+//
+//        XMLReader reader = factory.newSAXParser().getXMLReader()
+//        reader.setEntityResolver(resolver)
+//
+//        transformer.transform(new SAXSource(reader, new InputSource(inputFile.getAbsolutePath())), new StreamResult(outputFile.getAbsolutePath()))
+//
+//        project.copy {
+//            from "${inputDir}/images"
+//            into new File(outputDir, "images")
+//        }
+//        project.copy {
+//            from "${inputDir}/css"
+//            into new File(outputDir, "css")
+//        }
+//    }
+//
+//    private CatalogManager createCatalogManager() {
+//        CatalogManager manager = new CatalogManager()
+//        manager.setIgnoreMissingProperties(true)
+//        ClassLoader classLoader = this.getClass().getClassLoader()
+//        URL docbookCatalog = classLoader.getResource("docbook/catalog.xml")
+//        manager.setCatalogFiles(docbookCatalog.toExternalForm())
+//        return manager
+//    }
+//}
+//
+//class FopTask extends DefaultTask {
+//
+//    File inputDir = new File(project.getBuildDir(), "reference/pdf")
+//
+//    @TaskAction
+//    public final void foToPdf() {
+//        File foFile = new File(project.getBuildDir(), "reference/pdf/${project.docbook.baseName}.fo")
+//
+//        project.copy {
+//            from new File(project.buildDir, "work/images")
+//            into new File(inputDir, 'images')
+//        }
+//
+//        FopFactory fopFactory = FopFactory.newInstance()
+//        fopFactory.setBaseURL(inputDir.toURI().toURL().toExternalForm())
+//
+//        final File pdfFile = new File(foFile.parent, "${project.docbook.baseName}.pdf")
+//
+//        logger.debug("Transforming 'fo' file " + foFile + " to PDF: " + pdfFile)
+//
+//        OutputStream out = null
+//        try {
+//            out = new BufferedOutputStream(new FileOutputStream(pdfFile))
+//
+//            Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, out)
+//
+//            TransformerFactory factory = TransformerFactory.newInstance()
+//            Transformer transformer = factory.newTransformer()
+//
+//            Source src = new StreamSource(foFile)
+//            src.setSystemId(foFile.toURI().toURL().toExternalForm())
+//
+//            Result res = new SAXResult(fop.getDefaultHandler())
+//            transformer.transform(src, res)
+//        } finally {
+//            if (out != null) {
+//                out.close()
+//            }
+//        }
+//
+//        if (!foFile.delete()) {
+//            logger.warn("Failed to delete temporary 'fo' file " + foFile)
+//        }
+//        if (!project.delete(new File(inputDir, 'images'))) {
+//            logger.warn("Failed to delete 'images' path " + new File(inputDir, 'images'))
+//        }
+//        if (!project.delete(new File(inputDir, 'css'))) {
+//            logger.warn("Failed to delete 'css' path " + new File(inputDir, 'css'))
+//        }
+//    }
+//}
diff --git a/buildSrc/src/main/groovy/docbook/DocbookExtension.groovy b/buildSrc/src/main/groovy/docbook/DocbookExtension.groovy
new file mode 100644
index 0000000..b2008db
--- /dev/null
+++ b/buildSrc/src/main/groovy/docbook/DocbookExtension.groovy
@@ -0,0 +1,10 @@
+//package docbook
+//
+//class DocbookExtension {
+//
+//    String baseName = 'index'
+//    String docSourceDirName = 'src/docs/docbook'
+//    String imageSourceDirName = 'src/docs/images'
+//
+//    String version = 'undefined_doc_version'
+//}
diff --git a/buildSrc/src/main/groovy/eclipsebuild/BuildshipConfig.groovy b/buildSrc/src/main/groovy/eclipsebuild/BuildshipConfig.groovy
new file mode 100644
index 0000000..a315a71
--- /dev/null
+++ b/buildSrc/src/main/groovy/eclipsebuild/BuildshipConfig.groovy
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2015 the original author or authors.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Donát Csikós (Gradle Inc.) - initial API and implementation and initial documentation
+ */
+
+package eclipsebuild
+
+import org.gradle.api.Project
+
+/**
+ * Holds Buildship-specific, configuration-dependent settings for the plug-ins.
+ */
+class BuildshipConfig {
+
+    static final String RELEASE_TYPE_PROJECT_PROPERTY = 'release.type'
+
+    static final String RELEASE = 'release'
+    static final String MILESTONE = 'milestone'
+    static final String SNAPSHOT = 'snapshot'
+
+    static final def RELEASE_TYPES = [RELEASE, MILESTONE, SNAPSHOT]
+
+    final def project
+
+    private BuildshipConfig(Project project) {
+        this.project = project
+    }
+
+    static def on(Project project) {
+        new BuildshipConfig(project)
+    }
+
+    def isRelease() {
+        project.hasProperty(RELEASE_TYPE_PROJECT_PROPERTY) ? releaseType == RELEASE : false
+    }
+
+    def isMilestone() {
+        project.hasProperty(RELEASE_TYPE_PROJECT_PROPERTY) ? releaseType == MILESTONE : false
+    }
+
+    def isSnapshot() {
+        project.hasProperty(RELEASE_TYPE_PROJECT_PROPERTY) ? releaseType == SNAPSHOT : true // by default, use as snapshot release
+    }
+
+    private def getReleaseType() {
+        def releaseType = project.property(RELEASE_TYPE_PROJECT_PROPERTY)
+        if (RELEASE_TYPES.contains(releaseType)) {
+            releaseType
+        } else {
+          throw new IllegalArgumentException("Unsupported value for project property '$RELEASE_TYPE_PROJECT_PROPERTY': $releaseType. Supported values: $RELEASE_TYPES")
+        }
+    }
+
+}
diff --git a/buildSrc/src/main/groovy/eclipsebuild/FeaturePlugin.groovy b/buildSrc/src/main/groovy/eclipsebuild/FeaturePlugin.groovy
new file mode 100644
index 0000000..aea4b7a
--- /dev/null
+++ b/buildSrc/src/main/groovy/eclipsebuild/FeaturePlugin.groovy
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2015 the original author or authors.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Donát Csikós (Gradle Inc.) - initial API and implementation and initial documentation
+ */
+
+package eclipsebuild
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPlugin
+
+/**
+ * Gradle plug-in for building Eclipse features.
+ * <p/>
+ * It validates the existence of the files feature.xml, feature.properties, build.properties, and META-INF/MANIFEST.MF. It also
+ * adds all files and folders that are defined by the bin.includes entry in the build.properties file to the feature jar.
+ */
+class FeaturePlugin implements Plugin<Project> {
+
+    @Override
+    public void apply(Project project) {
+      // apply the Java plugin to have the life-cycle tasks
+      project.plugins.apply(JavaPlugin)
+
+      // sync jar content with the build.properties file
+      PluginUtils.configureFeatureJarInput(project)
+
+      // validate the content
+      validateRequiredFilesExist(project)
+    }
+
+    static void validateRequiredFilesExist(Project project) {
+        project.gradle.taskGraph.whenReady {
+            // make sure the required descriptors exist
+            assert project.file('build.properties').exists()
+            // TODO - do features really need a MANIFEST.MF?
+//            assert project.file('META-INF/MANIFEST.MF').exists()
+            assert project.file('feature.xml').exists()
+            assert project.file('feature.properties').exists()
+        }
+    }
+
+}
diff --git a/buildSrc/src/main/groovy/eclipsebuild/FileSemaphore.groovy b/buildSrc/src/main/groovy/eclipsebuild/FileSemaphore.groovy
new file mode 100644
index 0000000..7b9ad7f
--- /dev/null
+++ b/buildSrc/src/main/groovy/eclipsebuild/FileSemaphore.groovy
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2015 the original author or authors.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Donát Csikós (Gradle Inc.) - initial API and implementation and initial documentation
+ */
+
+package eclipsebuild
+
+import java.nio.channels.FileLock
+
+/**
+ * Utility class for inter-process-synchronization by using a {@code FileLock} as a semaphore.
+ * <p/>
+ * When the {@link FileSemaphore#lock()} method is called, a .lock file is created under a given folder guarded by
+ * the FileChannel.lock(). This lock can be released again by calling the {@link FileSemaphore#unlock()} method.
+ */
+class FileSemaphore {
+
+    final File directory
+    FileOutputStream fos
+    FileLock lock
+
+    FileSemaphore(File directory) {
+        this.directory = directory
+    }
+
+    def lock() {
+        File lockFile = new File(directory, ".lock")
+        if (!lockFile.exists()) {
+            lockFile.getParentFile().mkdirs()
+            lockFile.createNewFile()
+        }
+        fos = new FileOutputStream(lockFile)
+        lock = fos.getChannel().lock()
+    }
+
+    def unlock() {
+        lock.release()
+        fos.close()
+    }
+
+}
diff --git a/buildSrc/src/main/groovy/eclipsebuild/PluginUtils.groovy b/buildSrc/src/main/groovy/eclipsebuild/PluginUtils.groovy
new file mode 100644
index 0000000..168d21e
--- /dev/null
+++ b/buildSrc/src/main/groovy/eclipsebuild/PluginUtils.groovy
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2015 the original author or authors.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Donát Csikós (Gradle Inc.) - initial API and implementation and initial documentation
+ */
+
+package eclipsebuild
+
+import org.apache.tools.ant.filters.ReplaceTokens
+import org.gradle.api.Project
+
+/**
+ * Static helper functions which can be used different places around the Eclipse plugin build.
+ */
+public class PluginUtils {
+
+    /**
+     * Copies the content of the plugin project's MANIFEST.MF file to the plugin artifact generated by the <i>jar</i> task of this project.
+     * While copying the MANIFEST.MF file, the value of the <i>Bundle-Version</i> attribute is replaced with the build version of the project.
+     *
+     * @param project the plugin project whose MANIFEST.MF file of the artifact of the jar task to update
+     */
+    static void updatePluginManifest(Project project) {
+        project.jar {
+            manifest {
+                attributes 'Bundle-Version' : project.version
+                from('META-INF/MANIFEST.MF') {
+                    eachEntry { entry ->
+                        if (entry.key == 'Bundle-Version') {
+                            entry.value = project.version
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Configures the plugin artifact generated by the <i>jar</i> task of this plugin project to have the same content as declared in the
+     * plugin project's build.properties file.
+     *
+     * @param project the plugin project whose content of the artifact of the jar task to configure
+     */
+    static void configurePluginJarInput(Project project) {
+        def buildProperties = readBuildPropertiesFile(project)
+        Set resources = splitBinIncludes(buildProperties.getProperty('bin.includes'))
+        addPluginJarInput(resources, project)
+    }
+
+    /**
+     * Configures the feature artifact generated by the <i>jar</i> task of this feature project to have the same content as declared in the
+     * plugin project's build.properties file. While configuring the <i>jar</i> task, the version placeholder in the <i>feature.xml<i/> file
+     * is replaced with the build version of the project.
+     *
+     * @param project the plugin project whose content of the artifact of the jar task to configure
+     */
+    static void configureFeatureJarInput(Project project) {
+        def buildProperties = readBuildPropertiesFile(project)
+        Set resources = splitBinIncludes(buildProperties.getProperty('bin.includes'))
+        addFeatureJarInput(resources, project)
+    }
+
+    private static Properties readBuildPropertiesFile(Project project) {
+        def buildProperties = new Properties()
+        def fis = new FileInputStream(project.file('build.properties'))
+        buildProperties.load(fis)
+        fis.close()
+        buildProperties
+    }
+
+    private static Set splitBinIncludes(String binIncludes) {
+        Set result = new LinkedHashSet()
+        def virtualResources = ['.']
+        binIncludes.split(',').each { relPath ->
+            relPath = relPath.trim()
+            if(!relPath.isEmpty() && !(relPath in virtualResources)) {
+                result.add(relPath)
+            }
+        }
+        result
+    }
+
+    private static void addPluginJarInput(Set locations, Project project) {
+        for (String location in locations) {
+            File resource = project.file(location)
+            if (resource.isDirectory()) {
+                project.jar {
+                    from(location, { into(location) })
+                }
+            } else {
+                project.jar { from location }
+            }
+        }
+    }
+
+    private static void addFeatureJarInput(Set locations, Project project) {
+        for (String location in locations) {
+            File resource = project.file(location)
+            if (resource.isDirectory()) {
+                project.jar {
+                    from(location, { into(location) })
+                }
+            } else {
+                project.jar {
+                    from location
+                    if (resource.name == 'feature.xml') {
+                        // TODO - discuss with buildship project
+                        // filter(ReplaceTokens, tokens:['1.0.0.qualifier' :'"' + project.version + '"'], beginToken: '"', endToken: '"')
+                        filter(ReplaceTokens, tokens: project.tokenMap)
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/buildSrc/src/main/groovy/virgobuild/Config.groovy b/buildSrc/src/main/groovy/virgobuild/Config.groovy
new file mode 100644
index 0000000..dddd4e7
--- /dev/null
+++ b/buildSrc/src/main/groovy/virgobuild/Config.groovy
@@ -0,0 +1,41 @@
+package virgobuild
+
+import org.gradle.api.Project
+
+class Config {
+
+    private final Project project
+
+    static Config on(Project project) {
+        return new Config(project)
+    }
+
+    private Config(Project project) {
+        this.project = project
+    }
+
+    File getVirgoBuildToolsBaseDir() {
+        // to avoid configuration timing issues we don't cache the values in fields
+        // @see buildship project eclipsebuild.Config
+        project.hasProperty('virgoBuildToolsDir') ?
+                new File(project.property('virgoBuildToolsDir') as String) :
+                new File(System.getProperty('user.home'), '.tooling/virgo')
+    }
+
+    File getVirgoBuildToolsDir() {
+        String virgoBuildToolsBaseName="virgo-build-tools-${Constants.virgoBuildToolsVersion}"
+        new File(virgoBuildToolsBaseDir, virgoBuildToolsBaseName)
+    }
+
+    File getVirgoBuildToolsArchive() {
+        new File(virgoBuildToolsDir, 'virgo-tools.zip')
+    }
+
+    File getEquinoxLauncherJar() {
+        new File(virgoBuildToolsDir.path, '/plugins').listFiles().find { it.name.startsWith('org.eclipse.equinox.launcher_') }
+    }
+
+    File getJarProcessorJar() {
+        new File(virgoBuildToolsDir.path, '/plugins').listFiles().find { it.name.startsWith('org.eclipse.equinox.p2.jarprocessor_') }
+    }
+}
diff --git a/buildSrc/src/main/groovy/virgobuild/Constants.groovy b/buildSrc/src/main/groovy/virgobuild/Constants.groovy
new file mode 100644
index 0000000..9225808
--- /dev/null
+++ b/buildSrc/src/main/groovy/virgobuild/Constants.groovy
@@ -0,0 +1,16 @@
+package virgobuild
+
+class Constants {
+
+    static String getGradleTaskGroupName() {
+        return "Virgo Build"
+    }
+
+    static String getVirgoBuildToolsVersion() {
+        return '1.4.1.RELEASE'
+    }
+
+    static URL getVirgoBuildToolsDownloadUrl() {
+        return new URL("http://build.eclipse.org/rt/virgo/zips/release/VB/${virgoBuildToolsVersion}/virgo-build-tools-${virgoBuildToolsVersion}.zip")
+    }
+}
diff --git a/buildSrc/src/main/groovy/virgobuild/UpdateSitePlugin.groovy b/buildSrc/src/main/groovy/virgobuild/UpdateSitePlugin.groovy
new file mode 100644
index 0000000..4df50c1
--- /dev/null
+++ b/buildSrc/src/main/groovy/virgobuild/UpdateSitePlugin.groovy
@@ -0,0 +1,374 @@
+package virgobuild
+
+import static virgobuild.VirgoToolsPlugin.DOWNLOAD_VIRGO_BUILD_TOOLS_TASK_NAME
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.ProjectDependency
+import org.gradle.api.file.FileCollection
+import org.gradle.api.logging.LogLevel
+import org.gradle.api.plugins.JavaPlugin
+
+import eclipsebuild.FeaturePlugin
+
+// Derived from buildship Plugins
+class UpdateSitePlugin implements Plugin<Project> {
+
+    /**
+     * Extension class to configure the UpdateSite plugin.
+     */
+    static class Extension {
+        File siteDescriptor
+        FileCollection extraResources
+        // TOOD - remove this hook once all of our features are consolidated are migrated to feature projects
+        Closure hook
+        Closure signing
+        Closure mutateArtifactsXml
+    }
+
+    // name of the root node in the DSL
+    static final String DSL_EXTENSION_NAME = 'updateSite'
+
+    // buildship task names (in order of execution)
+    static final String COPY_BUNDLES_TASK_NAME = 'copyBundles'
+    static final String NORMALIZE_BUNDLES_TASK_NAME = 'normalizeBundles'
+    static final String SIGN_BUNDLES_TASK_NAME = 'signBundles'
+    static final String COMPRESS_BUNDLES_TASK_NAME = 'compressBundles'
+    static final String CREATE_P2_REPOSITORY_TASK_NAME = 'createP2Repository'
+
+    // temporary folder names during build
+    static final String PRE_NORMALIZED_BUNDLES_DIR_NAME = 'unconditioned-bundles'
+    static final String UNSIGNED_BUNDLES_DIR_NAME = 'unsigned-bundles'
+    static final String SIGNED_BUNDLES_DIR_NAME = 'signed-bundles'
+    static final String COMPRESSED_BUNDLES_DIR_NAME = 'compressed-bundles'
+    static final String FEATURES_DIR_NAME = 'features'
+    static final String PLUGINS_DIR_NAME = 'plugins'
+    static final String REPOSITORY_DIR_NAME = 'repository'
+
+    @Override
+    public void apply(Project project) {
+        configureProject(project)
+        addTaskCopyBundles(project)
+        addTaskNormalizeBundles(project)
+        addTaskSignBundles(project)
+        addTaskCompressBundles(project)
+        addTaskCreateP2Repository(project)
+    }
+
+    static void configureProject(Project project) {
+        // apply the Java plugin to have the life-cycle tasks
+        project.plugins.apply(JavaPlugin)
+
+        // create scopes for local and external plugins and features
+        project.configurations.create('localPlugin')
+        project.configurations.create('localFeature')
+        project.configurations.create('externalPlugin')
+        project.configurations.create('signedExternalPlugin')
+
+        // add the 'updateSite' extension
+        project.extensions.create(DSL_EXTENSION_NAME, Extension)
+        project.updateSite.siteDescriptor = project.file('category.xml')
+        project.updateSite.extraResources = project.files()
+        project.updateSite.hook = null
+        project.updateSite.signing = null
+        project.updateSite.mutateArtifactsXml = null
+
+        // validate the content
+        validateRequiredFilesExist(project)
+    }
+
+    static void addTaskCopyBundles(Project project) {
+        def copyBundlesTask = project.task(COPY_BUNDLES_TASK_NAME) {
+
+            dependsOn ':kernel:org.eclipse.virgo.kernel.services:rewriteJar'
+
+            group = Constants.gradleTaskGroupName
+            description = 'Collects the bundles that make up the update site.'
+            outputs.dir new File(project.buildDir, PRE_NORMALIZED_BUNDLES_DIR_NAME)
+            doLast { copyBundles(project) }
+            doLast { project.updateSite.hook(project) }
+        }
+
+        // add inputs for each plugin/feature project once this build script has been evaluated (before that, the dependencies are empty)
+        project.afterEvaluate {
+            for (ProjectDependency projectDependency : project.configurations.localPlugin.dependencies.withType(ProjectDependency)) {
+                // check if the dependent project is a bundle or feature, once its build script has been evaluated
+                def dependency = projectDependency.dependencyProject
+                //                if (dependency.plugins.hasPlugin(BundlePlugin)) {
+                copyBundlesTask.inputs.files dependency.tasks.assemble.outputs.files
+                //                } else {
+                //                    dependency.afterEvaluate {
+                //                        if (dependency.plugins.hasPlugin(BundlePlugin)) {
+                //                            copyBundlesTask.inputs.files dependency.tasks.jar.outputs.files
+                //                        }
+                //                    }
+                //                }
+            }
+        }
+
+        project.afterEvaluate {
+            for (ProjectDependency projectDependency : project.configurations.localFeature.dependencies.withType(ProjectDependency)) {
+                // check if the dependent project is a bundle or feature, once its build script has been evaluated
+                def dependency = projectDependency.dependencyProject
+                if (dependency.plugins.hasPlugin(FeaturePlugin)) {
+                    copyBundlesTask.inputs.files dependency.tasks.jar.outputs.files
+                } else {
+                    dependency.afterEvaluate {
+                        if (dependency.plugins.hasPlugin(FeaturePlugin)) {
+                            copyBundlesTask.inputs.files dependency.tasks.jar.outputs.files
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    static void copyBundles(Project project) {
+        def rootDir = new File(project.buildDir, PRE_NORMALIZED_BUNDLES_DIR_NAME)
+        def pluginsDir = new File(rootDir, PLUGINS_DIR_NAME)
+        def featuresDir = new File(rootDir, FEATURES_DIR_NAME)
+
+        // delete old content
+        if (rootDir.exists()) {
+            project.logger.info("Delete bundles directory '${rootDir.absolutePath}'")
+            rootDir.deleteDir()
+        }
+
+        // iterate over all the project dependencies to populate the update site with the plugins and features
+        project.logger.info("Copy features and plugins to bundles directory '${rootDir.absolutePath}'")
+
+        for (ProjectDependency projectDependency : project.configurations.localPlugin.dependencies.withType(ProjectDependency)) {
+            def dependency = projectDependency.dependencyProject
+
+            // copy the output jar for each plugin project dependency
+            //            if (dependency.plugins.hasPlugin(BundlePlugin)) {
+            //                project.logger.debug("Copy plugin project '${dependency.name}' with jar '${dependency.tasks.jar.outputs.files.singleFile.absolutePath}' to '${pluginsDir}'")
+            project.copy {
+                from dependency.tasks.jar.outputs.files.singleFile
+                into pluginsDir
+            }
+            //            }
+        }
+        for (ProjectDependency projectDependency : project.configurations.localFeature.dependencies.withType(ProjectDependency)) {
+            def dependency = projectDependency.dependencyProject
+            // copy the output jar for each feature project dependency
+            if (dependency.plugins.hasPlugin(FeaturePlugin)) {
+                project.logger.debug("Copy feature project '${dependency.name}' with jar '${dependency.tasks.jar.outputs.files.singleFile.absolutePath}' to '${pluginsDir}'")
+                project.copy {
+                    from dependency.tasks.jar.outputs.files.singleFile
+                    into featuresDir
+                }
+            }
+        }
+
+        // iterate over all external dependencies and add them to the plugins (this includes the transitive dependencies)
+        project.copy {
+            from project.configurations.externalPlugin
+            into pluginsDir
+        }
+    }
+
+    static void addTaskNormalizeBundles(Project project) {
+        project.task(NORMALIZE_BUNDLES_TASK_NAME, dependsOn: [
+            COPY_BUNDLES_TASK_NAME,
+            ":${DOWNLOAD_VIRGO_BUILD_TOOLS_TASK_NAME}"
+        ]) {
+            group = Constants.gradleTaskGroupName
+            description = 'Repacks the bundles that make up the update site using the pack200 tool.'
+            inputs.dir new File(project.buildDir, PRE_NORMALIZED_BUNDLES_DIR_NAME)
+            outputs.dir new File(project.buildDir, UNSIGNED_BUNDLES_DIR_NAME)
+            doLast { normalizeBundles(project) }
+        }
+    }
+
+    static void normalizeBundles(Project project) {
+        if (System.properties['skip.normalize.bundles'] == 'true') {
+            project.logger.warn("Skipping normalization of bundles!")
+            project.copy {
+                from new File(project.buildDir, PRE_NORMALIZED_BUNDLES_DIR_NAME)
+                into new File(project.buildDir, UNSIGNED_BUNDLES_DIR_NAME)
+            }
+        } else {
+            project.javaexec {
+                main = 'org.eclipse.equinox.internal.p2.jarprocessor.Main'
+                classpath Config.on(project).jarProcessorJar
+                args = [
+                    '-processAll',
+                    '-repack',
+                    '-outputDir',
+                    new File(project.buildDir, UNSIGNED_BUNDLES_DIR_NAME),
+                    new File(project.buildDir, PRE_NORMALIZED_BUNDLES_DIR_NAME)
+                ]
+            }
+        }
+    }
+
+    static void addTaskSignBundles(Project project) {
+        project.task(SIGN_BUNDLES_TASK_NAME, dependsOn: NORMALIZE_BUNDLES_TASK_NAME) {
+            group = Constants.gradleTaskGroupName
+            description = 'Signs the bundles that make up the update site.'
+            inputs.dir new File(project.buildDir, UNSIGNED_BUNDLES_DIR_NAME)
+            outputs.dir new File(project.buildDir, SIGNED_BUNDLES_DIR_NAME)
+            doLast { project.updateSite.signing(new File(project.buildDir, UNSIGNED_BUNDLES_DIR_NAME), new File(project.buildDir, SIGNED_BUNDLES_DIR_NAME)) }
+            doLast { copyOverAlreadySignedBundles(project) }
+            onlyIf { project.updateSite.signing != null }
+        }
+    }
+
+    static void copyOverAlreadySignedBundles(Project project) {
+        project.copy {
+            from project.configurations.signedExternalPlugin
+            into new File(project.buildDir, "$SIGNED_BUNDLES_DIR_NAME/$PLUGINS_DIR_NAME")
+        }
+    }
+
+    static void addTaskCompressBundles(Project project) {
+        project.task(COMPRESS_BUNDLES_TASK_NAME, dependsOn: [
+            NORMALIZE_BUNDLES_TASK_NAME,
+            SIGN_BUNDLES_TASK_NAME,
+            ":${DOWNLOAD_VIRGO_BUILD_TOOLS_TASK_NAME}"
+        ]) {
+            group = Constants.gradleTaskGroupName
+            description = 'Compresses the bundles that make up the update using the pack200 tool.'
+            project.afterEvaluate { inputs.dir project.updateSite.signing != null ? new File(project.buildDir, SIGNED_BUNDLES_DIR_NAME) : new File(project.buildDir, UNSIGNED_BUNDLES_DIR_NAME) }
+            outputs.dir  new File(project.buildDir, COMPRESSED_BUNDLES_DIR_NAME)
+            doLast { compressBundles(project) }
+        }
+    }
+
+    static void compressBundles(Project project) {
+        File uncompressedBundles = project.updateSite.signing != null ? new File(project.buildDir, SIGNED_BUNDLES_DIR_NAME) : new File(project.buildDir, UNSIGNED_BUNDLES_DIR_NAME)
+        File compressedBundles = new File(project.buildDir, COMPRESSED_BUNDLES_DIR_NAME)
+
+        // copy over all bundles
+        project.copy {
+            from uncompressedBundles
+            into compressedBundles
+        }
+
+        if (System.properties['skip.compress.bundles'] == 'true') {
+            project.logger.warn("Skipping compression of bundles!")
+        } else {
+            // compress and store them in the same folder
+            project.javaexec {
+                main = 'org.eclipse.equinox.internal.p2.jarprocessor.Main'
+                classpath Config.on(project).jarProcessorJar
+                args = [
+                    '-pack',
+                    '-outputDir',
+                    compressedBundles,
+                    compressedBundles
+                ]
+            }
+        }
+    }
+
+    static void addTaskCreateP2Repository(Project project) {
+        def createP2RepositoryTask = project.task(CREATE_P2_REPOSITORY_TASK_NAME, dependsOn: [
+            COMPRESS_BUNDLES_TASK_NAME,
+            ":${DOWNLOAD_VIRGO_BUILD_TOOLS_TASK_NAME}"
+        ]) {
+            group = Constants.gradleTaskGroupName
+            description = 'Generates the P2 repository.'
+            inputs.file project.updateSite.siteDescriptor
+            inputs.files project.updateSite.extraResources
+            inputs.dir new File(project.buildDir, COMPRESSED_BUNDLES_DIR_NAME)
+            outputs.dir new File(project.buildDir, REPOSITORY_DIR_NAME)
+            doLast { createP2Repository(project) }
+        }
+
+        project.tasks.assemble.dependsOn createP2RepositoryTask
+    }
+
+    static void createP2Repository(Project project) {
+        def repositoryDir = new File(project.buildDir, REPOSITORY_DIR_NAME)
+
+        // delete old content
+        if (repositoryDir.exists()) {
+            project.logger.info("Delete P2 repository directory '${repositoryDir.absolutePath}'")
+            repositoryDir.deleteDir()
+        }
+
+        // create the P2 update site
+        publishContentToLocalP2Repository(project, repositoryDir)
+
+        // add custom properties to the artifacts.xml file
+        def mutateArtifactsXml = project.updateSite.mutateArtifactsXml
+        if (mutateArtifactsXml) {
+            updateArtifactsXmlFromArchive(project, repositoryDir, mutateArtifactsXml)
+        }
+    }
+
+    static void publishContentToLocalP2Repository(Project project, File repositoryDir) {
+        def rootDir = new File(project.buildDir, COMPRESSED_BUNDLES_DIR_NAME)
+
+        // publish features/plugins to the update site
+        project.logger.info("Publish plugins and features from '${rootDir.absolutePath}' to the update site '${repositoryDir.absolutePath}'")
+        project.javaexec {
+            main = 'org.eclipse.equinox.launcher.Main'
+            classpath Config.on(project).equinoxLauncherJar
+            args = [
+                '-application',
+                'org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher',
+                '-metadataRepository',
+                repositoryDir.toURI().toURL(),
+                '-artifactRepository',
+                repositoryDir.toURI().toURL(),
+                '-source',
+                rootDir,
+                '-compress',
+                '-publishArtifacts',
+                '-reusePack200Files',
+                '-configs',
+                'ANY'
+            ]
+        }
+
+        // publish P2 category defined in the category.xml to the update site
+        project.logger.info("Publish categories defined in '${project.updateSite.siteDescriptor.absolutePath}' to the update site '${repositoryDir.absolutePath}'")
+        project.javaexec {
+            main = 'org.eclipse.equinox.launcher.Main'
+            classpath Config.on(project).equinoxLauncherJar
+            args = [
+                '-application',
+                'org.eclipse.equinox.p2.publisher.CategoryPublisher',
+                '-metadataRepository',
+                repositoryDir.toURI().toURL(),
+                '-categoryDefinition',
+                project.updateSite.siteDescriptor.toURI().toURL(),
+                '-compress'
+            ]
+        }
+
+        // copy the extra resources to the update site
+        project.copy {
+            from project.updateSite.extraResources
+            into repositoryDir
+        }
+    }
+
+    static void updateArtifactsXmlFromArchive(Project project, File repositoryLocation, Closure mutateArtifactsXml) {
+        //        // get the artifacts.xml file from the artifacts.jar
+        //        def artifactsJarFile = new File(repositoryLocation, "artifacts.jar")
+        //        def artifactsXmlFile = project.zipTree(artifactsJarFile).matching { 'artifacts.xml' }.singleFile
+        //
+        //        // parse the xml
+        //        def xml = new XmlParser().parse(artifactsXmlFile)
+        //
+        //        // apply artifacts.xml customization (append mirrors url, link to stat servers, etc.)
+        //        mutateArtifactsXml(xml)
+        //
+        //        // write the updated artifacts.xml back to its source
+        //        // the artifacts.xml is a temporary file hence it has to be copied back to the archive
+        //        new XmlNodePrinter(new PrintWriter(new FileWriter(artifactsXmlFile)), "  ", "'").print(xml)
+        //        project.ant.zip(update: true, filesonly: true, destfile: artifactsJarFile) { fileset(file: artifactsXmlFile) }
+    }
+
+    static void validateRequiredFilesExist(Project project) {
+        project.gradle.taskGraph.whenReady {
+            // make sure the required descriptors exist
+            assert project.file(project.updateSite.siteDescriptor).exists()
+        }
+    }
+
+}
diff --git a/buildSrc/src/main/groovy/virgobuild/VirgoToolsPlugin.groovy b/buildSrc/src/main/groovy/virgobuild/VirgoToolsPlugin.groovy
new file mode 100644
index 0000000..39f3cf4
--- /dev/null
+++ b/buildSrc/src/main/groovy/virgobuild/VirgoToolsPlugin.groovy
@@ -0,0 +1,173 @@
+package virgobuild
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.logging.LogLevel
+
+import eclipsebuild.FileSemaphore
+
+// new comment
+// Derived from buildship Plugins
+class VirgoToolsPlugin implements Plugin<Project> {
+
+    // virgo tasks names
+    static final String DOWNLOAD_VIRGO_BUILD_TOOLS_TASK_NAME = "downloadVirgoBuildTools"
+
+    static final String TASK_NAME_GENERATE_P2_INSTRUCTIONS = "generateP2Instructions"
+
+    @Override
+    public void apply(Project project) {
+        Config config = Config.on(project)
+        addTaskDownloadVirgoBuildTools(project, config)
+    }
+
+    static void generateP2Instructions(Project project, File assemblyFeatureDir) {
+        project.logger.info("Generating p2 instructions for '${assemblyFeatureDir}'.")
+        project.javaexec {
+            main = 'org.eclipse.equinox.launcher.Main'
+            classpath Config.on(project).equinoxLauncherJar
+            args = [
+                '-application',
+                'org.eclipse.virgo.build.p2tools.instructions.P2InstructionGeneratorApplication',
+                '-source',
+                assemblyFeatureDir
+            ]
+        }
+        project.logger.info("Generated p2 instructions for '${assemblyFeatureDir}'.")
+    }
+
+    static void publishProduct(Project project, File productFileLocation, File javaProfileLocation) {
+        File repositoryDir = project.file("${project.rootProject.projectDir}/org.eclipse.virgo.site/build/repository/")
+        publishProduct(project, repositoryDir, productFileLocation, javaProfileLocation)
+
+    }
+
+    // TODO remove unnecessary variable javaProfileLocation as this can be always oev.site/config/something?!
+    @Deprecated
+    static void publishProduct(Project project, File repositoryDir, File productFileLocation, File javaProfileLocation) {
+        project.logger.info("Publishing Virgo ${productFileLocation} to '${repositoryDir}'.")
+        project.javaexec {
+            main = 'org.eclipse.equinox.launcher.Main'
+            classpath Config.on(project).equinoxLauncherJar
+            args = [
+                '-application',
+                'org.eclipse.equinox.p2.publisher.ProductPublisher',
+                '-metadataRepository',
+                "file:${repositoryDir}",
+                '-artifactRepository',
+                "file:${repositoryDir}",
+                '-append',
+                '-compress',
+                '-publishArtifacts',
+                '-productFile',
+                productFileLocation,
+//                '-jreLocation',
+//                "${javaProfileLocation}",
+                '-configs',
+                'ANY.ANY.ANY',
+                '-flavor',
+                'tooling'
+            ]
+        }
+        project.logger.info("Published Virgo ${productFileLocation} to '${repositoryDir}'.")
+    }
+
+    static void installProduct(Project project, String productIu, File destinationDir) {
+        File repositoryDir = project.file("${project.rootProject.projectDir}/org.eclipse.virgo.site/build/repository/")
+        installProduct(project, productIu, repositoryDir, destinationDir)
+    }
+
+    @Deprecated
+    static void installProduct(Project project, String productIu, File repositoryDir, File destinationDir) {
+        project.logger.info("Installing Virgo '${productIu}' assembled from '${repositoryDir}' into '${destinationDir}'.")
+        project.javaexec {
+            main = 'org.eclipse.equinox.launcher.Main'
+            classpath Config.on(project).equinoxLauncherJar
+            args = [
+                '-application',
+                'org.eclipse.equinox.p2.director',
+                '-repository',
+                "file:${repositoryDir}",
+                '-installIU',
+                productIu,
+                '-tag',
+                'InitialState',
+                '-destination',
+                destinationDir,
+                '-profile',
+                'VIRGOProfile',
+                '-roaming'
+            ]
+        }
+        project.logger.info("Installed Virgo '${productIu}' assembled from '${repositoryDir}' into '${destinationDir}'.")
+    }
+
+    static void mirrorP2UpdateSite(Project project, String source) {
+        File repositoryDir = project.file("${project.rootProject.projectDir}/org.eclipse.virgo.site/build/repository/")
+        mirrorP2UpdateSite(project, source, repositoryDir)
+    }
+
+    static void mirrorP2UpdateSite(Project project, String source, File destinationDir) {
+        project.logger.info("Mirrorring update site '${source}' into '${destinationDir}'.")
+        project.javaexec {
+            main = 'org.eclipse.equinox.launcher.Main'
+            classpath Config.on(project).equinoxLauncherJar
+            args = [
+                '-application',
+                'org.eclipse.equinox.p2.metadata.repository.mirrorApplication',
+                '-writeMode',
+                '-source',
+                "${source}",
+                '-destination',
+                "${destinationDir}",
+            ]
+        }
+        project.javaexec {
+            main = 'org.eclipse.equinox.launcher.Main'
+            classpath Config.on(project).equinoxLauncherJar
+            args = [
+                '-application',
+                'org.eclipse.equinox.p2.artifact.repository.mirrorApplication',
+                '-writeMode',
+                '-source',
+                "${source}",
+                '-destination',
+                "${destinationDir}",
+            ]
+        }
+        project.logger.info("Mirrorred update site '${source}' into '${destinationDir}'.")
+    }
+
+    static void addTaskDownloadVirgoBuildTools(Project project, Config config) {
+        project.task(DOWNLOAD_VIRGO_BUILD_TOOLS_TASK_NAME) {
+            group = Constants.gradleTaskGroupName
+            description = "Downloads the Virgo Build Tools to perform P2 operations with."
+            outputs.file config.virgoBuildToolsArchive
+            doLast { downloadVirgoBuildTools(project, config) }
+        }
+    }
+
+    static void downloadVirgoBuildTools(Project project, Config config) {
+        // if multiple builds start on the same machine (which is the case with a CI server)
+        // we want to prevent them downloading the same file to the same destination
+        def directoryLock = new FileSemaphore(config.virgoBuildToolsDir)
+        directoryLock.lock()
+        try {
+            downloadVirgoBuildToolsUnprotected(project, config)
+        } finally {
+            directoryLock.unlock()
+        }
+    }
+
+    static void downloadVirgoBuildToolsUnprotected(Project project, Config config) {
+        // download the archive
+        File virgoBuildToolsArchive = config.virgoBuildToolsArchive
+        project.logger.info("Download Virgo Build Tools from '${Constants.virgoBuildToolsDownloadUrl}' to '${virgoBuildToolsArchive.absolutePath}'")
+        project.ant.get(src: Constants.virgoBuildToolsDownloadUrl, dest: virgoBuildToolsArchive)
+
+        // extract it to the same location where it was extracted
+        project.logger.info("Extract '$virgoBuildToolsArchive' to '$virgoBuildToolsArchive.parentFile.absolutePath'")
+        project.ant.unzip(src: virgoBuildToolsArchive, dest: virgoBuildToolsArchive.parentFile, overwrite: true)
+    }
+
+}
diff --git a/config/findbugs/excludeFilter.xml b/config/findbugs/excludeFilter.xml
new file mode 100644
index 0000000..3649aec
--- /dev/null
+++ b/config/findbugs/excludeFilter.xml
@@ -0,0 +1,6 @@
+<FindBugsFilter>
+     <!-- Exclusions -->
+     <Match>
+       	<Bug code="BAC,PS"/>
+     </Match>
+</FindBugsFilter>
diff --git a/ebr/README.md b/ebr/README.md
new file mode 100644
index 0000000..4971e96
--- /dev/null
+++ b/ebr/README.md
@@ -0,0 +1,22 @@
+## Publishing 3rd party bundles
+
+### Building 
+
+Gradle default tasks:
+ 1. `clean` - Cleans old build output
+ 2. `bundlor` - Generates the OSGiifed MF and outputs jar bundles
+ 3. `publishToMavenLocal` - Publishes jar bundles to `[USER_HOME]/.m2/org/eclipse/virgo/mirrored/[artifactId]/[version]/[bundle].jar`
+ 4. `test` - Executes the PaxExam tests, the bundles are resolved against local Maven repo thus `publishToMavenLocal` is required to be executed before `test`
+ 5. `publishIvyPublicationToIvyRepository` - Publishes the jar bundles to `build.eclipse.org` ivy repo (only possible on HIPP)
+ 
+Building locally:
+
+    `./gradlew clean bundlor publishToMavenLocal test`
+
+### Add new Version of Spring
+
+TBD
+
+### Writing PaxExam test for 3rd party bundle
+
+TBD
diff --git a/ebr/build.gradle b/ebr/build.gradle
new file mode 100644
index 0000000..0682ba1
--- /dev/null
+++ b/ebr/build.gradle
@@ -0,0 +1,111 @@
+buildscript {
+    repositories { mavenCentral() }
+    dependencies {
+        classpath 'org.apache.ivy:ivy:2.4.0'
+    }
+}
+
+defaultTasks 'clean', 'bundlor', 'publishToMavenLocal', 'test', 'publishIvyPublicationToIvyRepository'
+
+apply plugin: 'java'
+
+allprojects {
+    apply plugin: 'java'
+
+    repositories {
+        mavenCentral()
+        ivy {
+            url "http://build.eclipse.org/rt/virgo/ivy/bundles/release/"
+            layout "pattern", { artifact "[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" }
+        }
+        maven { url 'http://repository.springsource.com/maven/bundles/external' }
+    }
+}
+
+subprojects {
+    apply plugin: 'ivy-publish'
+    apply plugin: 'maven-publish'
+
+    configurations {
+        bundlorRuntime
+        sourceBundle
+    }
+
+    dependencies {
+        bundlorRuntime('org.eclipse.virgo.bundlor:org.eclipse.virgo.bundlor.commandline:1.1.2.RELEASE')
+        bundlorRuntime('org.eclipse.virgo.bundlor:org.eclipse.virgo.bundlor:1.1.2.RELEASE')
+        bundlorRuntime('org.eclipse.virgo.bundlor:org.eclipse.virgo.bundlor.blint:1.1.2.RELEASE')
+    }
+
+    task createBuildDir() {
+        doLast() {
+            file(project.buildDir).mkdir()
+        }
+    }
+
+    task('addProjectVersionToGradlePropertiesTask', type: Copy) {
+        ext.outputDir = new File(buildDir, 'bundlor-properties')
+        inputs.file project.rootProject.file('gradle.properties')
+        outputs.dir ext.outputDir
+        from project.rootProject.file('gradle.properties')
+        into ext.outputDir
+    }
+
+    def artifactName = project.name.split('-')[0]
+    def artifactVersion = project.name.split('-')[1]
+
+    def outputFile = new File(file(project.buildDir), "${project.name}.jar")
+
+    def propertiesPath = new File(file(project.buildDir), "bundlor-properties/gradle.properties")
+
+    task bundlor(type: JavaExec, dependsOn: [createBuildDir, 'addProjectVersionToGradlePropertiesTask']) {
+
+        classpath = configurations.bundlorRuntime
+
+        main = 'org.eclipse.virgo.bundlor.commandline.Bundlor'
+        args '-r', propertiesPath
+        args '-D', "springframeworkVersion=${springframeworkVersion}"
+        args '-i', "${-> configurations.sourceBundle[0]}" // lazy GString to resolve the configuration at runtime
+        args '-m', "${artifactName}.mf"
+        args '-o', outputFile
+        args '-f'
+    }
+
+    publishing {
+        publications {
+            ivy(IvyPublication) {
+                organisation 'org.eclipse.virgo.mirrored'
+                module "${artifactName}"
+                revision "${artifactVersion}"
+                artifact(outputFile)
+            }
+            maven(MavenPublication) {
+                groupId 'org.eclipse.virgo.mirrored'
+                artifactId "${artifactName}"
+                version "${artifactVersion}"
+                artifact(outputFile)
+            }
+        }
+        repositories {
+            ivy {
+                url "/opt/public/rt/virgo/ivy/bundles/release"
+            }
+        }
+    }
+}
+
+dependencies {
+    testCompile "junit:junit:${junitVersion}"
+    testCompile "org.ops4j.pax.exam:pax-exam-junit4:$paxExamJunit4Version"
+    testCompile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+    testCompile group: "org.eclipse.virgo.mirrored", name: "javax.inject", version: javaxInjectVersion, configuration: "compile", ext: "jar"
+    testRuntime "org.ops4j.pax.exam:pax-exam-container-native:$paxExamContainerNativeVersion"
+    testRuntime "org.ops4j.pax.exam:pax-exam-link-mvn:$paxExamLinkMvnVersion"
+    testRuntime "org.ops4j.pax.url:pax-url-aether:$paxUrlAetherVersion"
+}
+
+task wrapper(type: Wrapper) {
+    description 'Creates a local Gradle Wrapper'
+    group = 'Build Setup'
+    gradleVersion = '3.5' // CQ 13634
+}
diff --git a/ebr/com.squareup.okhttp3-3.8.0/build.gradle b/ebr/com.squareup.okhttp3-3.8.0/build.gradle
new file mode 100644
index 0000000..7e7973f
--- /dev/null
+++ b/ebr/com.squareup.okhttp3-3.8.0/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttp3Version
+}
diff --git a/ebr/com.squareup.okhttp3-3.8.0/com.squareup.okhttp3.mf b/ebr/com.squareup.okhttp3-3.8.0/com.squareup.okhttp3.mf
new file mode 100644
index 0000000..c539dad
--- /dev/null
+++ b/ebr/com.squareup.okhttp3-3.8.0/com.squareup.okhttp3.mf
@@ -0,0 +1,16 @@
+Bundle-SymbolicName: com.squareup.okhttp3
+Bundle-Name: OkHttp
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: 3.8.0
+Import-Template:
+ okio;version="[1.13.0,2)",
+ android.util;version="0";resolution:="optional",
+ javax.annotation;version="0";resolution:=optional,
+ javax.net.*;version="0";resolution:=optional,
+ javax.security.auth.x500;version="0";resolution:=optional
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/com.squareup.okio-1.13.0/build.gradle b/ebr/com.squareup.okio-1.13.0/build.gradle
new file mode 100644
index 0000000..9aabb53
--- /dev/null
+++ b/ebr/com.squareup.okio-1.13.0/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'com.squareup.okio', name: 'okio', version: okioVersion
+}
diff --git a/ebr/com.squareup.okio-1.13.0/com.squareup.okio.mf b/ebr/com.squareup.okio-1.13.0/com.squareup.okio.mf
new file mode 100644
index 0000000..96eb69a
--- /dev/null
+++ b/ebr/com.squareup.okio-1.13.0/com.squareup.okio.mf
@@ -0,0 +1,14 @@
+Bundle-SymbolicName: com.squareup.okio
+Bundle-Name: Okio
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: 1.13.0
+Import-Template:
+ javax.annotation;version="0";resolution:=optional,
+ javax.crypto.*;version="0";resolution:=optional,
+ org.codehaus.mojo.animal_sniffer;version="[1.15,2)";resolution:=optional
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/ebr.iml b/ebr/ebr.iml
new file mode 100644
index 0000000..f4601dc
--- /dev/null
+++ b/ebr/ebr.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="ebr" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/ebr/gradle.properties b/ebr/gradle.properties
new file mode 100644
index 0000000..8ba926d
--- /dev/null
+++ b/ebr/gradle.properties
@@ -0,0 +1,360 @@
+# sftp server url
+ECLIPSE_ORG_FTP_HOST=build.eclipse.org
+# sftp username
+ECLIPSE_ORG_FTP_USER=virgoBuild
+# sftp key
+ECLIPSE_ORG_FTP_IDENTITY=id_virgoBuild_rsa
+# absolute path to the root of the update-sites mirror
+ECLIPSE_ORG_FTP_MIRROR_PATH=/shared/rt/virgo/ivy/bundles/release
+
+# CQ4129 (PB CQ3480)
+junitVersion = 4.7
+
+# CQ4132 (PB CQ1887)
+easymockVersion = 2.3
+
+# PaxExam
+# CQ8541
+paxExamJunit4Version = 4.11.0
+paxExamContainerNativeVersion = 4.11.0
+paxExamLinkMvnVersion = 4.11.0
+paxUrlAetherVersion = 2.5.2
+paxUrlWrapVersion = 2.3.0
+
+# CQ 12463 SLF4J jcl-over-slf4j Version: 1.7.22
+# CQ 12465 SLF4J jul-to-slf4j Version: 1.7.22
+# CQ 12464 SLF4J log4j-over-slf4j Version: 1.7.22
+# CQ 12462 SLF4J slf4j-api Version: 1.7.22
+# CQ 12540 SLF4J slf4j-nop version 1.7.22 and Later
+slf4jVersion = 1.7.22
+# CQ 12508 - Logback Classic Version 1.1.8
+# CQ 12507 - Logback Core Version: 1.1.8
+logbackVersion = 1.1.8
+
+# Eclipse Kepler 4.3.2 (SR2)
+equinoxVersion = 3.9.1.v20140110-1610
+osgiServicesVersion = 3.3.100.v20130513-1956
+osgiEnterpriseVersion = 4.2.0.v201108120515
+
+equinoxAppVersion = 1.3.100.v20130327-1442
+# ConfigAdminService
+equinoxCmVersion = 1.0.400.v20130327-1442
+# Eclipse Mars.2
+# requires 'package org.osgi.framework 1.8.0'
+# equinoxCmVersion = 1.1.0.v20131021-1936
+equinoxCommonVersion = 3.6.200.v20130402-1505
+# DeclarativeService
+equinoxDsVersion = 1.4.101.v20130813-1853
+equinoxConsoleVersion = 1.0.100.v20130429-0953
+equinoxConsoleSshVersion = 1.0.0.v20130515-2026
+equinoxEventVersion = 1.3.0.v20130327-1442
+equinoxFrameworkadminEquinoxVersion = 1.0.500.v20130327-2119
+equinoxFrameworkadminVersion = 2.0.100.v20130327-2119
+
+#equinoxHttpJettyVersion = 3.0.200.v20131021-1843
+equinoxHttpJettyVersion = 3.0.100.v20130327-1442
+#equinoxHttpServletVersion = 1.1.500.v20140318-1755
+equinoxHttpServletVersion = 1.1.400.v20130418-1354
+
+# Note: Used by Virgo Build Tools, too
+equinoxLauncherVersion = 1.3.0.v20130327-1440
+equinoxPreferencesVersion = 3.5.100.v20130422-1538
+equinoxRegionVersion = 1.1.101.v20130722-1314
+equinoxRegionExportedPackageVersion = 1.1.0
+equinoxRegistryVersion = 3.5.301.v20130717-1549
+equinoxSecurityVersion = 1.2.0.v20130424-1801
+equinoxSimpleConfiguratorVersion = 1.0.400.v20130327-2119
+equinoxSimpleConfiguratorManipulatorVersion = 2.0.0.v20130327-2119
+equinoxUtilVersion = 1.0.500.v20130404-1337
+
+eclipseCoreContenttypeVersion = 3.4.200.v20130326-1255
+eclipseCoreJobsVersion = 3.5.300.v20130429-1813
+eclipseCoreNetVersion = 1.2.200.v20130430-1352
+eclipseCoreRuntimeVersion = 3.9.100.v20131218-1515
+
+eclipseJdtCoreCompilerBatchVersion = 3.10.0.v20140604-1726
+
+eclipseEcfIdentityVersion = 3.2.0.v20130604-1622
+eclipseEcfFiletransferVersion = 5.0.0.v20130604-1622
+eclipseEcfProviderFiletransferVersion = 3.2.0.v20130604-1622
+eclipseEcfSslVersion = 1.1.0.v20130604-1622
+eclipseEcfVersion = 3.2.0.v20130604-1622
+
+sat4jCoreVersion = 2.3.5.v201308161310
+sat4jPbVersion = 2.3.5.v201308161310
+
+p2ArtifactRepositoryVersion = 1.1.200.v20130515-2028
+p2ConsoleVersion = 1.0.300.v20130327-2119
+p2CoreVersion = 2.3.0.v20130327-2119
+p2DirectorVersion = 2.3.1.v20140221-1852
+p2EngineVersion = 2.3.0.v20130526-2122
+p2GarbageCollectorVersion = 1.0.200.v20130327-2119
+p2JarProcessorVersion = 1.0.300.v20130327-2119
+p2MetadataVersion = 2.2.0.v20130523-1557
+p2MetadataRepositoryVersion = 1.2.100.v20130327-2119
+p2PublisherVersion = 1.3.0.v20140129-1405
+p2PublisherEclipseVersion = 1.1.200.v20130516-1953
+p2RepositoryVersion = 2.3.0.v20130412-2032
+p2TouchpointEclipseVersion = 2.1.200.v20130327-2119
+p2TouchpointNativesVersion = 1.1.100.v20130327-2119
+p2TransportEcfVersion = 1.1.0.v20130516-1858
+
+#CQ5528
+apacheSshdCoreVersion = 0.5.0.v201108120515
+#CQ6402 - command, shell and runtime
+gogoCommandVersion = 0.10.0.v201209301215
+gogoRuntimeVersion = 0.10.0.v201209301036
+gogoShellVersion = 0.10.0.v201211091412
+#CQ5527
+minaCoreVersion = 2.0.2.v201108120515
+
+orgAopAllianceVersion = 1.0.0
+
+geminiBlueprintVersion = 2.0.0.RELEASE
+// TODO update CQs
+#CQ 13690 org.springframework.aop
+#CQ 13691 org.springframework.aspects
+#CQ 13692 org.springframework.beans
+#CQ 13693 org.springframework.context
+#CQ 13694 org.springframework.context.support
+#CQ 13695 org.springframework.core
+#CQ 13696 org.springframework.expression
+#CQ 13697 org.springframework.jdbc
+#CQ 13698 org.springframework.jms
+#CQ 13699 org.springframework.messaging
+#CQ 13700 org.springframework.orm
+#CQ 13701 org.springframework.oxm
+#CQ 13702 org.springframework.transaction
+#CQ 13703 org.springframework.web
+#CQ 13704 org.springframework.webmvc
+#CQ 13705 org.springframework.webmvc.portlet
+#CQ 13706 org.springframework.websocket
+springframeworkVersion = 4.3.9.RELEASE
+
+geminiManagementVersion = 1.0.5.RELEASE
+geminiWebVersion = 3.0.0.RC3
+
+objectwebAsmVersion = 3.2.0.v200909071300
+scannotationVersion = 1.0.2.v201205170710
+
+commonsBeanutilsVersion = 1.8.0.v201205091237
+# CQ 10288 (PB CQ9217)
+commonsCodecVersion = 1.10.0
+commonsCliVersion = 1.2.0
+# CQ12542 (PB CQ10386)
+commonsCollectionsVersion = 3.2.2
+commonsDbcpVersion = 1.4.0.v201204271417
+# CQ12541 (PB CQ12051)
+commonsFileuploadVersion = 1.3.2
+# CQ3956 (PB CQ1765)
+commonsHttpClientVersion = 3.1.0
+
+# CQ9555 (PB Orbit CQ8938)
+httpcomponentsCoreVersion = 4.3.3
+# CQ9556 (PB Orbit CQ8934)
+httpcomponentsClientVersion = 4.3.6
+
+# CQ11189 (PB Orbit CQ8294)
+commonsIoVersion = 2.2
+commonsLangVersion = 3.1.0
+# CQ pending PB CQ10162?
+commonsLoggingVersion = 1.2.0
+commonsPoolVersion = 1.6.0.v201204271246
+
+apacheTaglibsStandardVersion = 1.1.2.v20110517
+
+apacheBvalVersion = 0.5.0
+# TODO update derby to apacheDerbyVersion = 10.12.1.1 required by spring-orm
+apacheDerbyVersion = 10.8.2.2_v201211210650
+# CQ4833 log4j Version: 1.2.15 (Subset - see all comments) (PB Orbit CQ3560)
+# TODO move forward to 1.2.17 used in spring-core
+apacheLog4jVersion = 1.2.15.v201012070815
+# CQ7162 OpenEJB (Subset) Version: 4.5.2
+apacheOpenejbVersion = 4.5.2
+apacheOpenejbCoreVersion = 4.5.2.virgo-3
+
+# CQ7145 openwebbeans (Subset) Version: 1.1.7
+apacheOpenwebbeansVersion = 1.1.7.v201304201405
+apacheOpenwebbeansEEVersion = 1.1.7.v201304200545
+apacheOpenwebbeansTomcat7Version = 1.1.7.v201304201405-virgo-1
+
+# CQ7149 XBean (Subset) Version: 3.12
+apacheXBeanAsmVersion = 3.12.0.v201304200545
+apacheXBeanBundleutilsVersion = 3.12.0.v201304200545
+apacheXBeanFinderVersion = 3.12.0.v201304201405
+apacheXBeanNamingVersion = 3.12.0.v201304201405
+apacheXBeanReflectVersion = 3.12.0.v201304201405
+
+# CQ7147 Java Server Faces Version: 2.1.18
+# TODO What's the difference of javax.faces and com.sun.faces - do we need both?
+glassfishJavaxFacesVersion = 2.1.18.v201304200545
+glassfishComSunFacesVersion = 2.1.18.v201304210537-virgo-2
+
+geronimoComponentsConnectorVersion = 3.1.1.v201205170953
+geronimoComponentsTransactionVersion = 3.1.1.v201205170710
+geronimoSpecsJ2eeManagementVersion = 1.0.0.v201205091237
+geronimoSpecsOsgiLocatorVersion = 1.1.0.v201205170953
+geronimoSpecsOsgiRegistryVersion = 1.1.0.v201205170710
+
+javaxActivationVersion = 1.1.0.v201108011116
+javaxAnnotationVersion= 1.2.0.v201401042248
+# CQ6093 ejb-api Version: 3.1.1
+javaxEjbVersion=3.1.1.v201204261316
+javaxElVersion=3.0.0.20150414
+# CQ6090 (PB Orbit CQ3578)
+javaxInjectVersion = 1.0.0.v20091030
+javaxJmsVersion=1.1.0.v201205091237
+javaxMailVersion = 1.5.5
+# TODO create CQ?
+# Available from Eclipse Link p2 site http://download.eclipse.org/rt/eclipselink/updates/2.4.2.v20130514-5956486/
+javaxPersistenceVersion=2.1.0.v201304241213
+# CQ3940
+javaxPortletVersion=2.0.0
+javaxResourceVersion=1.6.0.v201204270900
+javaxSecurityAuthMessageVersion=1.1.0
+# TODO - check if a CQ is missing
+javaxSecurityJaccVersion=1.4.0.v201205031350
+# CQ6246 Jetty servlet-api Version: 3.0 (PB CQ3217)
+# TODO - update CQ?
+javaxServletVersion = 3.1.0.20150414
+javaxServletJspVersion = 2.3.0
+# CQ12544 javax.servlet.jsp.jstl api Version: 1.2.1
+javaxServletJspJstlApiVersion=1.2.1
+# CQ12543 JSP Standard Tag Library Version 1.2.5-b03
+javaxServletJspJstlImplVersion=1.2.5.b03
+# CQ12565 Java Interceptor API 1.2
+javaxInterceptorVersion = 1.2
+# CQ12546 Java Transaction API Version: 1.2 (PB Orbit CQ7296)
+javaxTransactionVersion = 1.2
+# CQ6095 Bean Validation API Version: 1.0.0 GA (PB CQ3570)
+javaxValidationVersion=1.0.0.GA_v201205091237
+# Covered by Tomcat CQ
+javaxWebsocketVersion=1.1.0.v201401130840
+javaxWsdlVersion=1.6.2.v201012040545
+javaxWsRsVersion=1.1.1.v20101004-1200
+javaxXmlRpcVersion=1.1.0.v201005080400
+
+eclipsePersistenceAntlrVersion = 3.2.0.v201206041011
+eclipsePersistenceAsmVersion = 3.3.1.v201206041142
+# TODO update to 2.4.2 required by spring-orm
+eclipsePersistenceCoreVersion = 2.4.1.v20121003-ad44345
+eclipsePersistenceJpaVersion = 2.4.1.v20121003-ad44345
+eclipsePersistenceJpaJpqlVersion = 2.0.1.v20121003-ad44345
+
+# CQ6092 cdi-api Version: 1.0 (Context and Dependency Injection API from JSR 299)
+cdiApiVersion = 1.0.0.v201105160744
+javassistVersion = 3.17.1.GA
+# CQ6100 Java Open Transaction Manager (JOTM) 2.1.9 *Subset*
+jotmVersion = 2.1.9.v201204271116
+# TODO - update to 2.2.2 required by spring-context-support
+quartzVersion = 1.6.0.v201204271540
+
+# CQ11207
+jolokiaVersion = 1.3.3
+
+aspectjVersion = 1.8.10
+
+# Delivered with RAP 2.3.2
+jettyVersion = 8.1.16.v20140903
+# TODO move forward to latest release (as of April 8th 2016)
+#jettyVersion = 8.1.18.v20150929
+
+# CQ9080 Apache Tomcat Version: 7.0.56 (PB Orbit CQ8933)
+#apacheCatalinaVersion = 7.0.56.v201412180755
+apacheCatalinaVersion = 8.5.5
+
+# CQ7699 (PB Orbit CQ6772)
+mozillaJavascriptVersion = 1.7.4.v201209142200
+# CQ7126 Hibernate Version: 4.1.0
+# TODO - upgrade to 4.3.2.Final used in spring-context
+hibernateVersion = 4.1.0.Final
+
+# RAP 2.3.2
+eclipseCoreCommandsVersion = 3.6.100.v20140528-1422
+eclipseCoreDatabindingObservableVersion = 1.4.1.v20140210-1835
+eclipseCoreDatabindingPropertyVersion = 1.4.200.v20140214-0004
+eclipseCoreDatabindingVersion = 1.4.2.v20140729-1044
+icuBaseVersion = 52.1.1.v201501240615
+
+rapRwtVersion = 2.3.2.20150128-1013
+rapRwtOsgiVersion = 2.3.2.20150119-1706
+rapJfaceVersion = 2.3.2.20150119-1706
+rapJfaceDatabindingVersion = 2.3.2.20150119-1706
+rapUiVersion = 2.3.2.20150119-1706
+
+# performance-tests
+#    jwebunitVersion = 2.2.0
+# TODO create CQ for version 3.2?
+jwebunitVersion = 3.2
+# TODO create CQ for version 2.15?
+htmlUnitVersion = 2.15
+
+# system-tests
+dumbsterVersion = 1.6.0
+
+# OSGi test
+# optional spring 4.2.9.RELEASE dependencies - used only to generate the correct OSGi manifests
+
+# spring-aop
+jamonVersion = 2.81
+commonsPool2Version = 2.4.2
+
+# spring-aspects
+javaxCacheVersion = 1.0.0
+
+# spring-beans
+groovyVersion = 2.4.5
+snakeYamlVersion = 1.16
+
+# spring-context
+# bundlor fails with 2.0b4
+beanShellVersion = 2
+jodaTimeVersion = 2.9.1
+jrubyVersion = 1.7.23
+
+# spring-context-support
+commonjVersion = 1.1.0
+ehcacheVersion = 2.10.1
+freemarkerVersion = 2.3.23
+jasperreportsVersion = 6.2.0
+velocityVersion = 1.7
+benmanesCaffeineVersion = 2.3.5
+
+# spring-core
+joptSimpleVersion = 4.9
+
+# spring-jdbc
+c3p0Version = 0.9.5.2
+hsqldbVersion = 2.3.3
+jacksonVersion = 2.6.4
+
+# spring-messaging
+nettyVersion = 4.0.33.Final
+reactorVersion = 2.0.7.RELEASE
+
+# spring-orm
+openjpaVersion = 2.4.0
+
+# spring-oxm
+xstreamVersion = 1.4.8
+xmlBeans = 2.6.0
+castorVersion = 1.4.0
+jibxVersion = 1.2.6
+
+# spring-web
+hessianVersion = 4.0.38
+gsonVersion = 2.5
+protobufJavaVersion = 2.6.1
+protobufJavaFormatVersion = 1.2
+romeVersion = 1.5.1
+okhttpVersion = 2.7.0
+okhttp3Version = 3.8.0
+okioVersion = 1.13.0
+
+# spring-webmvc
+jxlVersion = 2.6.12
+poiVersion = 3.13
+webjarsVersion = 0.28
+
+# spring-websocket
+undertowVersion = 1.3.10.Final
diff --git a/ebr/gradle/wrapper/gradle-wrapper.jar b/ebr/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..6ffa237
--- /dev/null
+++ b/ebr/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/ebr/gradle/wrapper/gradle-wrapper.properties b/ebr/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..f17aa14
--- /dev/null
+++ b/ebr/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Jun 09 15:10:16 CEST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
diff --git a/ebr/gradlew b/ebr/gradlew
new file mode 100755
index 0000000..9aa616c
--- /dev/null
+++ b/ebr/gradlew
@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/ebr/gradlew.bat b/ebr/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/ebr/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off

+@rem ##########################################################################

+@rem

+@rem  Gradle startup script for Windows

+@rem

+@rem ##########################################################################

+

+@rem Set local scope for the variables with windows NT shell

+if "%OS%"=="Windows_NT" setlocal

+

+set DIRNAME=%~dp0

+if "%DIRNAME%" == "" set DIRNAME=.

+set APP_BASE_NAME=%~n0

+set APP_HOME=%DIRNAME%

+

+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

+set DEFAULT_JVM_OPTS=

+

+@rem Find java.exe

+if defined JAVA_HOME goto findJavaFromJavaHome

+

+set JAVA_EXE=java.exe

+%JAVA_EXE% -version >NUL 2>&1

+if "%ERRORLEVEL%" == "0" goto init

+

+echo.

+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

+echo.

+echo Please set the JAVA_HOME variable in your environment to match the

+echo location of your Java installation.

+

+goto fail

+

+:findJavaFromJavaHome

+set JAVA_HOME=%JAVA_HOME:"=%

+set JAVA_EXE=%JAVA_HOME%/bin/java.exe

+

+if exist "%JAVA_EXE%" goto init

+

+echo.

+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

+echo.

+echo Please set the JAVA_HOME variable in your environment to match the

+echo location of your Java installation.

+

+goto fail

+

+:init

+@rem Get command-line arguments, handling Windows variants

+

+if not "%OS%" == "Windows_NT" goto win9xME_args

+

+:win9xME_args

+@rem Slurp the command line arguments.

+set CMD_LINE_ARGS=

+set _SKIP=2

+

+:win9xME_args_slurp

+if "x%~1" == "x" goto execute

+

+set CMD_LINE_ARGS=%*

+

+:execute

+@rem Setup the command line

+

+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+

+@rem Execute Gradle

+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

+

+:end

+@rem End local scope for the variables with windows NT shell

+if "%ERRORLEVEL%"=="0" goto mainEnd

+

+:fail

+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

+rem the _cmd.exe /c_ return code!

+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

+exit /b 1

+

+:mainEnd

+if "%OS%"=="Windows_NT" endlocal

+

+:omega

diff --git a/ebr/org.aspectj.weaver-1.8.10/build.gradle b/ebr/org.aspectj.weaver-1.8.10/build.gradle
new file mode 100644
index 0000000..89b906b
--- /dev/null
+++ b/ebr/org.aspectj.weaver-1.8.10/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.aspectj', name: 'aspectjweaver', version: "${aspectjVersion}"
+}
diff --git a/ebr/org.aspectj.weaver-1.8.10/org.aspectj.weaver.mf b/ebr/org.aspectj.weaver-1.8.10/org.aspectj.weaver.mf
new file mode 100644
index 0000000..a04e97a
--- /dev/null
+++ b/ebr/org.aspectj.weaver-1.8.10/org.aspectj.weaver.mf
@@ -0,0 +1,22 @@
+Name: org/aspectj/weaver/
+Specification-Title: AspectJ Weaver Classes
+Specification-Version: ${aspectjVersion}
+Specification-Vendor: aspectj.org
+Implementation-Title: org.aspectj.weaver
+Implementation-Version: ${aspectjVersion}
+Implementation-Vendor: aspectj.org
+Premain-Class: org.aspectj.weaver.loadtime.Agent
+Agent-Class: org.aspectj.weaver.loadtime.Agent
+Can-Redefine-Classes: true
+Bundle-SymbolicName: org.aspectj.weaver
+Bundle-Name: AspectJ weaver
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${aspectjVersion}
+Import-Template:
+ com.bea.jvm;version="0";resolution:="optional",
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}";resolution:="optional",
+ javax.xml.parsers;version="0",
+ org.xml.sax.*;version="0"
+Export-Template:
+ org.aspectj.*;version="${aspectjVersion}"
diff --git a/ebr/org.springframework.aop-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.aop-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..e1a17da
--- /dev/null
+++ b/ebr/org.springframework.aop-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-aop', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.aop-4.2.9.RELEASE/org.springframework.aop.mf b/ebr/org.springframework.aop-4.2.9.RELEASE/org.springframework.aop.mf
new file mode 100644
index 0000000..726727a
--- /dev/null
+++ b/ebr/org.springframework.aop-4.2.9.RELEASE/org.springframework.aop.mf
@@ -0,0 +1,26 @@
+Bundle-SymbolicName: org.springframework.aop
+Bundle-Name: Spring AOP
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ com.jamonapi.*;version="${jamonVersion:[=.=.=, +1)}";resolution:=optional,
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.commons.pool.*;version="${commonsPoolVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.pool2.*;version="${commonsPool2Version:[=.=.=, +1)}";resolution:=optional,
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.objenesis.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.aop.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.aop-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.aop-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..d6f2c81
--- /dev/null
+++ b/ebr/org.springframework.aop-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,16 @@
+configurations {
+    origin
+}
+
+dependencies {
+    origin group: 'org.springframework', name: 'spring-aop', version: "${springframeworkVersion}"
+    sourceBundle fileTree("$buildDir/libs")
+}
+
+task removeAopallianceFromJar(type: Jar) {
+    baseName = 'spring-aop'
+    from zipTree(configurations.origin[0])
+    exclude 'org/aopalliance/**'
+}
+
+bundlor.dependsOn removeAopallianceFromJar
diff --git a/ebr/org.springframework.aop-4.3.9.RELEASE/org.springframework.aop.mf b/ebr/org.springframework.aop-4.3.9.RELEASE/org.springframework.aop.mf
new file mode 100644
index 0000000..d05ddc6
--- /dev/null
+++ b/ebr/org.springframework.aop-4.3.9.RELEASE/org.springframework.aop.mf
@@ -0,0 +1,27 @@
+Bundle-SymbolicName: org.springframework.aop
+Bundle-Name: Spring AOP
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.objenesis.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ com.jamonapi.*;version="${jamonVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.pool.*;version="${commonsPoolVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.pool2.*;version="${commonsPool2Version:[=.=.=, +1)}";resolution:=optional,
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
+ org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.aop.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Export-Package,
+ Import-Package,
+ Tool
+
diff --git a/ebr/org.springframework.aspects-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.aspects-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..5520b71
--- /dev/null
+++ b/ebr/org.springframework.aspects-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-aspects', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.aspects-4.2.9.RELEASE/org.springframework.aspects.mf b/ebr/org.springframework.aspects-4.2.9.RELEASE/org.springframework.aspects.mf
new file mode 100644
index 0000000..7cefed2
--- /dev/null
+++ b/ebr/org.springframework.aspects-4.2.9.RELEASE/org.springframework.aspects.mf
@@ -0,0 +1,29 @@
+Bundle-SymbolicName: org.springframework.aspects
+Bundle-Name: Spring Aspects
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ javax.cache;version="${javaxCacheVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.persistence;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cache.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.dao.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.orm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional
+Export-Template:
+ org.springframework.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Tool
+Excluded-Imports:
+ org.springframework.context.*
diff --git a/ebr/org.springframework.aspects-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.aspects-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..5520b71
--- /dev/null
+++ b/ebr/org.springframework.aspects-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-aspects', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.aspects-4.3.9.RELEASE/org.springframework.aspects.mf b/ebr/org.springframework.aspects-4.3.9.RELEASE/org.springframework.aspects.mf
new file mode 100644
index 0000000..132f4bb
--- /dev/null
+++ b/ebr/org.springframework.aspects-4.3.9.RELEASE/org.springframework.aspects.mf
@@ -0,0 +1,30 @@
+Bundle-SymbolicName: org.springframework.aspects
+Bundle-Name: Spring Aspects
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ javax.cache;version="${javaxCacheVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.persistence;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ javax.transaction;version="${javaxTransactionVersion:[=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cache.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.dao.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.orm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional
+Export-Template:
+ org.springframework.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Tool
+Excluded-Imports:
+ org.springframework.context.*
diff --git a/ebr/org.springframework.beans-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.beans-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..cd78444
--- /dev/null
+++ b/ebr/org.springframework.beans-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-beans', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.beans-4.2.9.RELEASE/org.springframework.beans.mf b/ebr/org.springframework.beans-4.2.9.RELEASE/org.springframework.beans.mf
new file mode 100644
index 0000000..4005ddd
--- /dev/null
+++ b/ebr/org.springframework.beans-4.2.9.RELEASE/org.springframework.beans.mf
@@ -0,0 +1,26 @@
+Bundle-SymbolicName: org.springframework.beans
+Bundle-Name: Spring Beans
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ javax.el.*;version="[2.2.5, 4)";resolution:=optional,
+ javax.inject.*;version="[1, 2)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ org.yaml.snakeyaml.*;version="${snakeYamlVersion:[=.=.=, +1)}";resolution:="optional",
+ org.codehaus.groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.beans.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.beans-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.beans-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..cd78444
--- /dev/null
+++ b/ebr/org.springframework.beans-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-beans', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.beans-4.3.9.RELEASE/org.springframework.beans.mf b/ebr/org.springframework.beans-4.3.9.RELEASE/org.springframework.beans.mf
new file mode 100644
index 0000000..8e5882b
--- /dev/null
+++ b/ebr/org.springframework.beans-4.3.9.RELEASE/org.springframework.beans.mf
@@ -0,0 +1,26 @@
+Bundle-SymbolicName: org.springframework.beans
+Bundle-Name: Spring Beans
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ javax.el.*;version="[2.2.5, 4)";resolution:=optional,
+ javax.inject.*;version="[1, 2)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ org.yaml.snakeyaml.*;version="${snakeYamlVersion:[=.=.=, +1)}";resolution:="optional",
+ org.codehaus.groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.beans.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.context-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.context-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..652c1a5
--- /dev/null
+++ b/ebr/org.springframework.context-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-context', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.context-4.2.9.RELEASE/org.springframework.context.mf b/ebr/org.springframework.context-4.2.9.RELEASE/org.springframework.context.mf
new file mode 100644
index 0000000..09182f1
--- /dev/null
+++ b/ebr/org.springframework.context-4.2.9.RELEASE/org.springframework.context.mf
@@ -0,0 +1,58 @@
+Bundle-SymbolicName: org.springframework.context
+Bundle-Name: Spring Context
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Package:
+ org.springframework.cglib.reflect;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.orm.jpa.support;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ javax.inject;version="[1, 2)";resolution:=optional,
+ javax.persistence;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ com.ibm.websphere.management;version="0";resolution:=optional
+Import-Template:
+ bsh.*;version="${beanShellVersion:[=.=.=, +1)}";resolution:=optional,
+ com.sun.net.*;version="0";resolution:=optional,
+ edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional,
+ groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ javax.annotation.*;version="0";resolution:=optional,
+ javax.ejb.*;version="[3, 4)";resolution:=optional,
+ javax.enterprise.concurrent;version="[1, 2)";resolution:=optional,
+ javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional,
+ javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ javax.management.*;version="0";resolution:=optional,
+ javax.money.*;version="[1, 2)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.persistence.*;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ javax.rmi.*;version="0";resolution:=optional,
+ javax.script;version="0";resotion:=optional,
+ javax.validation.*;version="[1, 2)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ net.sf.ehcache.*;version="[1.0.0, 3.0.0)";resolution:=optional,
+ javax.cache.*;version="[0.5.0, 0.5.0]";resolution:=optional,
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
+ org.codehaus.groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ org.hibernate.validator.*;version="${hibernateVersion:[=.=.=, +1)}";resolution:=optional,
+ org.joda.*;version="${jodaTimeVersion:[=.=.=, +1)}";resolution:=optional,
+ org.jruby.*;version="${jrubyVersion:[=.=.=, +1)}";resolution:=optional,
+ org.omg.CORBA.*;version="0";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.asm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.instrument.*;version="0";resolution:=optional,
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.objenesis.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.context-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.context-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..652c1a5
--- /dev/null
+++ b/ebr/org.springframework.context-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-context', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.context-4.3.9.RELEASE/org.springframework.context.mf b/ebr/org.springframework.context-4.3.9.RELEASE/org.springframework.context.mf
new file mode 100644
index 0000000..9c5159c
--- /dev/null
+++ b/ebr/org.springframework.context-4.3.9.RELEASE/org.springframework.context.mf
@@ -0,0 +1,58 @@
+Bundle-SymbolicName: org.springframework.context
+Bundle-Name: Spring Context
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Package:
+ org.springframework.cglib.reflect;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.orm.jpa.support;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ javax.inject;version="[1, 2)";resolution:=optional,
+ javax.persistence;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ com.ibm.websphere.management;version="0";resolution:=optional
+Import-Template:
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ bsh.*;version="${beanShellVersion:[=.=.=, +1)}";resolution:=optional,
+ com.sun.net.*;version="0";resolution:=optional,
+ edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional,
+ groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ javax.annotation.*;version="0";resolution:=optional,
+ javax.ejb.*;version="[3, 4)";resolution:=optional,
+ javax.enterprise.concurrent;version="[1, 2)";resolution:=optional,
+ javax.interceptor.*;version="[3.0.0, 4.0.0)";resolution:=optional,
+ javax.jms.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ javax.management.*;version="0";resolution:=optional,
+ javax.money.*;version="[1, 2)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.persistence.*;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ javax.rmi.*;version="0";resolution:=optional,
+ javax.script;version="0";resotion:=optional,
+ javax.validation.*;version="[1, 2)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ net.sf.ehcache.*;version="[1.0.0, 3.0.0)";resolution:=optional,
+ javax.cache.*;version="[0.5.0, 0.5.0]";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
+ org.codehaus.groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ org.hibernate.validator.*;version="${hibernateVersion:[=.=.=, +1)}";resolution:=optional,
+ org.joda.*;version="${jodaTimeVersion:[=.=.=, +1)}";resolution:=optional,
+ org.jruby.*;version="${jrubyVersion:[=.=.=, +1)}";resolution:=optional,
+ org.omg.CORBA.*;version="0";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.asm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.instrument.*;version="0";resolution:=optional,
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.objenesis.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.context.support-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.context.support-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..a6af036
--- /dev/null
+++ b/ebr/org.springframework.context.support-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-context-support', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.context.support-4.2.9.RELEASE/org.springframework.context.support.mf b/ebr/org.springframework.context.support-4.2.9.RELEASE/org.springframework.context.support.mf
new file mode 100644
index 0000000..d54c5fa
--- /dev/null
+++ b/ebr/org.springframework.context.support-4.2.9.RELEASE/org.springframework.context.support.mf
@@ -0,0 +1,40 @@
+Bundle-SymbolicName: org.springframework.context.support
+Bundle-Name: Spring Context Support
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ com.google.common.*;version="[19, 100)";resolution:=optional,
+ commonj.*;version="${commonjVersion:[=.=.=, +1)}";resolution:=optional,
+ freemarker.*;version="${freemarkerVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.activation.*;version="0";resolution:=optional,
+ javax.cache.*;version="[1, 2)";resolution:=optional,
+ javax.mail.*;version="[1.5, 2)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.sql.*;version="0";resolution:=optional,
+ net.sf.ehcache.*;version="${ehcacheVersion:[=.=.=, +1)}";resolution:=optional,
+ net.sf.jasperreports.*;version="${jasperreportsVersion:[=.=.=, +1)}";resolution:=optional,
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ org.apache.commons.collections.*;version="${commonsCollectionsVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.velocity.*;version="${velocityVersion:[=.=.=, +1)}";resolution:=optional,
+ org.quartz.*;version="[2.2.2, 3)";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.jdbc.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.cache.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.context.support.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.context.support-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.context.support-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..a6af036
--- /dev/null
+++ b/ebr/org.springframework.context.support-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-context-support', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.context.support-4.3.9.RELEASE/org.springframework.context.support.mf b/ebr/org.springframework.context.support-4.3.9.RELEASE/org.springframework.context.support.mf
new file mode 100644
index 0000000..0f76dbd
--- /dev/null
+++ b/ebr/org.springframework.context.support-4.3.9.RELEASE/org.springframework.context.support.mf
@@ -0,0 +1,42 @@
+Bundle-SymbolicName: org.springframework.context.support
+Bundle-Name: Spring Context Support
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ com.github.benmanes.caffeine.cache;version="${benmanesCaffeineVersion:[=.=.=, +1)}";resolution:=optional,
+ com.google.common.*;version="[19, 100)";resolution:=optional,
+ commonj.*;version="${commonjVersion:[=.=.=, +1)}";resolution:=optional,
+ freemarker.*;version="${freemarkerVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.activation.*;version="0";resolution:=optional,
+ javax.cache.*;version="[1, 2)";resolution:=optional,
+ javax.mail.*;version="[1.5, 2)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.sql.*;version="0";resolution:=optional,
+ net.sf.ehcache.*;version="${ehcacheVersion:[=.=.=, +1)}";resolution:=optional,
+ net.sf.jasperreports.*;version="${jasperreportsVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.collections.*;version="${commonsCollectionsVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.velocity.*;version="${velocityVersion:[=.=.=, +1)}";resolution:=optional,
+ org.quartz.*;version="[2.2.2, 3)";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.jdbc.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.cache.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.context.support.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.core-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.core-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..fc6f651
--- /dev/null
+++ b/ebr/org.springframework.core-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-core', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.core-4.2.9.RELEASE/org.springframework.core.mf b/ebr/org.springframework.core-4.2.9.RELEASE/org.springframework.core.mf
new file mode 100644
index 0000000..d43b39a
--- /dev/null
+++ b/ebr/org.springframework.core-4.2.9.RELEASE/org.springframework.core.mf
@@ -0,0 +1,28 @@
+Bundle-SymbolicName: org.springframework.core
+Bundle-Name: Spring Core
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ javax.net;version="0",
+ javax.xml.*;version="0",
+ joptsimple.*;version="${joptSimpleVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.tools.ant.*;version="0";resolution:=optional,
+ org.apache.commons.codec.*;version="${commonsCodecVersion:[=.=.=, +1)}",
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.log4j.*;version="${apacheLog4jVersion:[=.=.=, +1)}";resolution:=optional,
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.asm.*;version="${springframeworkVersion}",
+ org.springframework.cglib.*;version="${springframeworkVersion}",
+ org.springframework.core.*;version="${springframeworkVersion}",
+ org.springframework.lang.*;version="${springframeworkVersion}",
+ org.springframework.objenesis.*;version="${springframeworkVersion}",
+ org.springframework.util.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.core-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.core-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..fc6f651
--- /dev/null
+++ b/ebr/org.springframework.core-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-core', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.core-4.3.9.RELEASE/org.springframework.core.mf b/ebr/org.springframework.core-4.3.9.RELEASE/org.springframework.core.mf
new file mode 100644
index 0000000..4cf2d4d
--- /dev/null
+++ b/ebr/org.springframework.core-4.3.9.RELEASE/org.springframework.core.mf
@@ -0,0 +1,28 @@
+Bundle-SymbolicName: org.springframework.core
+Bundle-Name: Spring Core
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ javax.net;version="0",
+ javax.xml.*;version="0",
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ joptsimple.*;version="${joptSimpleVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.tools.ant.*;version="0";resolution:=optional,
+ org.apache.commons.codec.*;version="${commonsCodecVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.log4j.*;version="${apacheLog4jVersion:[=.=.=, +1)}";resolution:=optional,
+ org.aspectj.*;version="${aspectjVersion:[=.=.=, +1)}";resolution:=optional,
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.asm.*;version="${springframeworkVersion}",
+ org.springframework.cglib.*;version="${springframeworkVersion}",
+ org.springframework.core.*;version="${springframeworkVersion}",
+ org.springframework.lang.*;version="${springframeworkVersion}",
+ org.springframework.objenesis.*;version="${springframeworkVersion}",
+ org.springframework.util.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.core-4.3.9.RELEASE/src/test/resources/bundle.conf b/ebr/org.springframework.core-4.3.9.RELEASE/src/test/resources/bundle.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ebr/org.springframework.core-4.3.9.RELEASE/src/test/resources/bundle.conf
diff --git a/ebr/org.springframework.expression-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.expression-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..cd029da
--- /dev/null
+++ b/ebr/org.springframework.expression-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-expression', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.expression-4.2.9.RELEASE/org.springframework.expression.mf b/ebr/org.springframework.expression-4.2.9.RELEASE/org.springframework.expression.mf
new file mode 100644
index 0000000..8363aac
--- /dev/null
+++ b/ebr/org.springframework.expression-4.2.9.RELEASE/org.springframework.expression.mf
@@ -0,0 +1,12 @@
+Bundle-SymbolicName: org.springframework.expression
+Bundle-Name: Spring Expression Language
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.springframework.asm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}"
+Export-Template:
+ org.springframework.expression.*;version="${springframeworkVersion}"
diff --git a/ebr/org.springframework.expression-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.expression-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..cd029da
--- /dev/null
+++ b/ebr/org.springframework.expression-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-expression', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.expression-4.3.9.RELEASE/org.springframework.expression.mf b/ebr/org.springframework.expression-4.3.9.RELEASE/org.springframework.expression.mf
new file mode 100644
index 0000000..8363aac
--- /dev/null
+++ b/ebr/org.springframework.expression-4.3.9.RELEASE/org.springframework.expression.mf
@@ -0,0 +1,12 @@
+Bundle-SymbolicName: org.springframework.expression
+Bundle-Name: Spring Expression Language
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.springframework.asm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}"
+Export-Template:
+ org.springframework.expression.*;version="${springframeworkVersion}"
diff --git a/ebr/org.springframework.instrument.tomcat/org.springframework.instrument.tomcat.mf b/ebr/org.springframework.instrument.tomcat/org.springframework.instrument.tomcat.mf
new file mode 100644
index 0000000..6dc1970
--- /dev/null
+++ b/ebr/org.springframework.instrument.tomcat/org.springframework.instrument.tomcat.mf
@@ -0,0 +1,6 @@
+Bundle-SymbolicName: org.springframework.instrument.tomcat
+Bundle-Name: Spring Instrument Tomcat Weaver
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Import-Template:
+ org.apache.catalina.*;version="[6.0.16, 7.0.0)"
diff --git a/ebr/org.springframework.instrument/org.springframework.instrument.mf b/ebr/org.springframework.instrument/org.springframework.instrument.mf
new file mode 100644
index 0000000..0ceb406
--- /dev/null
+++ b/ebr/org.springframework.instrument/org.springframework.instrument.mf
@@ -0,0 +1,5 @@
+Bundle-SymbolicName: org.springframework.instrument
+Bundle-Name: Spring Instrument
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Premain-Class: org.springframework.instrument.InstrumentationSavingAgent
diff --git a/ebr/org.springframework.jdbc-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.jdbc-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..f4e86ff
--- /dev/null
+++ b/ebr/org.springframework.jdbc-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-jdbc', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.jdbc-4.2.9.RELEASE/org.springframework.jdbc.mf b/ebr/org.springframework.jdbc-4.2.9.RELEASE/org.springframework.jdbc.mf
new file mode 100644
index 0000000..9c5be59
--- /dev/null
+++ b/ebr/org.springframework.jdbc-4.2.9.RELEASE/org.springframework.jdbc.mf
@@ -0,0 +1,39 @@
+Bundle-SymbolicName: org.springframework.jdbc
+Bundle-Name: Spring JDBC
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Package:
+ com.ibm.websphere.rsadapter;version="0";resolution:=optional,
+ com.ibm.ws.rsadapter.jdbc;version="0";resolution:=optional,
+ oracle.jdbc;version="0";resolution:=optional,
+ oracle.sql;version="0";resolution:=optional,
+ org.jboss.resource.adapter.jdbc;version="0";resolution:=optional,
+ weblogic.jdbc.extensions;version="0";resolution:=optional
+Import-Template:
+ com.mchange.v2.c3p0.*;version="${c3p0Version:[=.=.=, +1)}";resolution:=optional,
+ com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.sql.*;version="0",
+ javax.transaction.*;version="${javaxTransactionVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ org.h2.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ org.hsqldb.*;version="${hsqldbVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.derby.*;version="${apacheDerbyVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.dao.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.jdbc.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.jdbc-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.jdbc-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..f4e86ff
--- /dev/null
+++ b/ebr/org.springframework.jdbc-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-jdbc', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.jdbc-4.3.9.RELEASE/org.springframework.jdbc.mf b/ebr/org.springframework.jdbc-4.3.9.RELEASE/org.springframework.jdbc.mf
new file mode 100644
index 0000000..9c5be59
--- /dev/null
+++ b/ebr/org.springframework.jdbc-4.3.9.RELEASE/org.springframework.jdbc.mf
@@ -0,0 +1,39 @@
+Bundle-SymbolicName: org.springframework.jdbc
+Bundle-Name: Spring JDBC
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Package:
+ com.ibm.websphere.rsadapter;version="0";resolution:=optional,
+ com.ibm.ws.rsadapter.jdbc;version="0";resolution:=optional,
+ oracle.jdbc;version="0";resolution:=optional,
+ oracle.sql;version="0";resolution:=optional,
+ org.jboss.resource.adapter.jdbc;version="0";resolution:=optional,
+ weblogic.jdbc.extensions;version="0";resolution:=optional
+Import-Template:
+ com.mchange.v2.c3p0.*;version="${c3p0Version:[=.=.=, +1)}";resolution:=optional,
+ com.sun.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.sql.*;version="0",
+ javax.transaction.*;version="${javaxTransactionVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ org.h2.*;version="[1.0.0, 2.0.0)";resolution:=optional,
+ org.hsqldb.*;version="${hsqldbVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.derby.*;version="${apacheDerbyVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.dao.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.jdbc.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.jms-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.jms-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..2e8586f
--- /dev/null
+++ b/ebr/org.springframework.jms-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-jms', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.jms-4.2.9.RELEASE/org.springframework.jms.mf b/ebr/org.springframework.jms-4.2.9.RELEASE/org.springframework.jms.mf
new file mode 100644
index 0000000..2d14fdd
--- /dev/null
+++ b/ebr/org.springframework.jms-4.2.9.RELEASE/org.springframework.jms.mf
@@ -0,0 +1,35 @@
+Bundle-SymbolicName: org.springframework.jms
+Bundle-Name: Spring JMS
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ javax.jms.*;version="[1.1, 2)",
+ javax.naming.*;version="0";resolution:=optional,
+ javax.resource.*;version="[1.5, 2)";resolution:=optional,
+ javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.codehaus.jackson.*;version="[1.4.2, 2.0.0)";resolution:=optional,
+ com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.jca.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.messaging.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.remoting.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.jms.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.jms-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.jms-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..2e8586f
--- /dev/null
+++ b/ebr/org.springframework.jms-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-jms', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.jms-4.3.9.RELEASE/org.springframework.jms.mf b/ebr/org.springframework.jms-4.3.9.RELEASE/org.springframework.jms.mf
new file mode 100644
index 0000000..c54ee07
--- /dev/null
+++ b/ebr/org.springframework.jms-4.3.9.RELEASE/org.springframework.jms.mf
@@ -0,0 +1,35 @@
+Bundle-SymbolicName: org.springframework.jms
+Bundle-Name: Spring JMS
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ javax.jms.*;version="[1.1, 2)",
+ javax.naming.*;version="0";resolution:=optional,
+ javax.resource.*;version="[1.5, 2)";resolution:=optional,
+ javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.codehaus.jackson.*;version="[1.4.2, 2.0.0)";resolution:=optional,
+ com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.jca.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.messaging.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.remoting.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.jms.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.messaging-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.messaging-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..fc5a4cf
--- /dev/null
+++ b/ebr/org.springframework.messaging-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-messaging', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.messaging-4.2.9.RELEASE/org.springframework.messaging.mf b/ebr/org.springframework.messaging-4.2.9.RELEASE/org.springframework.messaging.mf
new file mode 100644
index 0000000..cd299e0
--- /dev/null
+++ b/ebr/org.springframework.messaging-4.2.9.RELEASE/org.springframework.messaging.mf
@@ -0,0 +1,30 @@
+Bundle-SymbolicName: org.springframework.messaging
+Bundle-Name: Spring Messaging
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
+ io.netty.*;version="${nettyVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.xml.transform.*;version="0",
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.reactivestreams;version="[1, 2)";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.format.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.stereotype.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ reactor.*;version="${reactorVersion:[=.=.=, +1)}";resolution:=optional
+Export-Template:
+ org.springframework.messaging.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.messaging-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.messaging-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..fc5a4cf
--- /dev/null
+++ b/ebr/org.springframework.messaging-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-messaging', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.messaging-4.3.9.RELEASE/org.springframework.messaging.mf b/ebr/org.springframework.messaging-4.3.9.RELEASE/org.springframework.messaging.mf
new file mode 100644
index 0000000..cd299e0
--- /dev/null
+++ b/ebr/org.springframework.messaging-4.3.9.RELEASE/org.springframework.messaging.mf
@@ -0,0 +1,30 @@
+Bundle-SymbolicName: org.springframework.messaging
+Bundle-Name: Spring Messaging
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
+ io.netty.*;version="${nettyVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.xml.transform.*;version="0",
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.reactivestreams;version="[1, 2)";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.format.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.stereotype.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ reactor.*;version="${reactorVersion:[=.=.=, +1)}";resolution:=optional
+Export-Template:
+ org.springframework.messaging.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.orm-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.orm-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..f790231
--- /dev/null
+++ b/ebr/org.springframework.orm-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-orm', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.orm-4.2.9.RELEASE/org.springframework.orm.mf b/ebr/org.springframework.orm-4.2.9.RELEASE/org.springframework.orm.mf
new file mode 100644
index 0000000..2ba2d03
--- /dev/null
+++ b/ebr/org.springframework.orm-4.2.9.RELEASE/org.springframework.orm.mf
@@ -0,0 +1,50 @@
+Bundle-SymbolicName: org.springframework.orm
+Bundle-Name: Spring ORM
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Package:
+ com.ibatis.sqlmap.engine.transaction.external;version="[2.3.4, 3)";resolution:=optional,
+ oracle.toplink.essentials.expressions;version="[2, 3)";resolution:=optional,
+ javax.persistence.criteria;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ javax.persistence.metamodel;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ org.eclipse.persistence.expressions;version="[1, 3)";resolution:=optional
+Import-Template:
+ com.ibatis.*;version="[2.3.4, 3)";resolution:=optional,
+ javax.jdo.*;version="[3.1, 4)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.persistence.*;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ javax.servlet.*;version="[3.0.1, 4)";resolution:=optional,
+ javax.sql.*;version="0";resolution:=optional,
+ javax.transaction.*;version="[1.0.1, 2)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ oracle.toplink.essentials.*;version="[2, 3)";resolution:=optional,
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.openjpa.persistence.*;version="${openjpaVersion:[=.=.=, +1)}";resolution:=optional,
+ org.eclipse.persistence.core.*;version="${eclipsePersistenceCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ org.eclipse.persistence.jpa.*;version="${eclipsePersistenceJpaVersion:[=.=.=, +1)}";resolution:=optional,
+ org.eclipse.persistence.sessions.*;version="${eclipsePersistenceCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ org.hibernate.*;version="[3.6.10.Final, 6)";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.dao.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.instrument.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.jdbc.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.orm.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ DynamicImport-Package,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.orm-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.orm-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..f790231
--- /dev/null
+++ b/ebr/org.springframework.orm-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-orm', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.orm-4.3.9.RELEASE/org.springframework.orm.mf b/ebr/org.springframework.orm-4.3.9.RELEASE/org.springframework.orm.mf
new file mode 100644
index 0000000..46033d2
--- /dev/null
+++ b/ebr/org.springframework.orm-4.3.9.RELEASE/org.springframework.orm.mf
@@ -0,0 +1,50 @@
+Bundle-SymbolicName: org.springframework.orm
+Bundle-Name: Spring ORM
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Package:
+ com.ibatis.sqlmap.engine.transaction.external;version="[2.3.4, 3)";resolution:=optional,
+ oracle.toplink.essentials.expressions;version="[2, 3)";resolution:=optional,
+ javax.persistence.criteria;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ javax.persistence.metamodel;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ org.eclipse.persistence.expressions;version="[1, 3)";resolution:=optional
+Import-Template:
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ com.ibatis.*;version="[2.3.4, 3)";resolution:=optional,
+ javax.jdo.*;version="[3.1, 4)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.persistence.*;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ javax.servlet.*;version="[3.0.1, 4)";resolution:=optional,
+ javax.sql.*;version="0";resolution:=optional,
+ javax.transaction.*;version="[1.0.1, 2)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ oracle.toplink.essentials.*;version="[2, 3)";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.openjpa.persistence.*;version="${openjpaVersion:[=.=.=, +1)}";resolution:=optional,
+ org.eclipse.persistence.core.*;version="${eclipsePersistenceCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ org.eclipse.persistence.jpa.*;version="${eclipsePersistenceJpaVersion:[=.=.=, +1)}";resolution:=optional,
+ org.eclipse.persistence.sessions.*;version="${eclipsePersistenceCoreVersion:[=.=.=, +1)}";resolution:=optional,
+ org.hibernate.*;version="[3.6.10.Final, 6)";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.dao.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.instrument.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.jdbc.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.transaction.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.orm.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ DynamicImport-Package,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.oxm-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.oxm-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..8e714fc
--- /dev/null
+++ b/ebr/org.springframework.oxm-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-oxm', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.oxm-4.2.9.RELEASE/org.springframework.oxm.mf b/ebr/org.springframework.oxm-4.2.9.RELEASE/org.springframework.oxm.mf
new file mode 100644
index 0000000..a442e30
--- /dev/null
+++ b/ebr/org.springframework.oxm-4.2.9.RELEASE/org.springframework.oxm.mf
@@ -0,0 +1,28 @@
+Bundle-SymbolicName: org.springframework.oxm
+Bundle-Name: Spring Object/XML Mapping
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ javax.activation.*;version="0";resolution:=optional,
+ javax.xml.*;version="0",
+ javax.xml.bind.*;version="0";resolution:=optional,
+ com.thoughtworks.xstream.*;version="${xstreamVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.xmlbeans.*;version="${xmlBeans:[=.=.=, +1)}";resolution:=optional,
+ org.exolab.castor.*;version="${castorVersion:[=.=.=, +1)}";resolution:=optional,
+ org.jibx.runtime.*;version="${jibxVersion:[=.=.=, +1)}";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0",
+ org.xml.sax.*;version="0"
+Export-Template:
+ org.springframework.oxm.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ DynamicImport-Package,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.oxm-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.oxm-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..8e714fc
--- /dev/null
+++ b/ebr/org.springframework.oxm-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-oxm', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.oxm-4.3.9.RELEASE/org.springframework.oxm.mf b/ebr/org.springframework.oxm-4.3.9.RELEASE/org.springframework.oxm.mf
new file mode 100644
index 0000000..a442e30
--- /dev/null
+++ b/ebr/org.springframework.oxm-4.3.9.RELEASE/org.springframework.oxm.mf
@@ -0,0 +1,28 @@
+Bundle-SymbolicName: org.springframework.oxm
+Bundle-Name: Spring Object/XML Mapping
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ javax.activation.*;version="0";resolution:=optional,
+ javax.xml.*;version="0",
+ javax.xml.bind.*;version="0";resolution:=optional,
+ com.thoughtworks.xstream.*;version="${xstreamVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.xmlbeans.*;version="${xmlBeans:[=.=.=, +1)}";resolution:=optional,
+ org.exolab.castor.*;version="${castorVersion:[=.=.=, +1)}";resolution:=optional,
+ org.jibx.runtime.*;version="${jibxVersion:[=.=.=, +1)}";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0",
+ org.xml.sax.*;version="0"
+Export-Template:
+ org.springframework.oxm.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ DynamicImport-Package,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.test-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.test-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..b8eb387
--- /dev/null
+++ b/ebr/org.springframework.test-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,64 @@
+import java.util.jar.JarEntry
+import java.util.jar.JarOutputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import java.util.zip.ZipOutputStream
+
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-test', version: "${springframeworkVersion}"
+}
+
+task rewriteJar(dependsOn: 'bundlor') {
+    String jarFileName = file(buildDir.path + "/org.springframework.test-${springframeworkVersion}.jar").path
+    doLast() {
+        ZipFile jarFile = new ZipFile(jarFileName)
+        println "------------"
+        println "Cloning content of jar file ${jarFileName}:"
+        println "------------"
+        new ZipFile(jarFileName).entries().findAll{ !it.directory }.each { println it.name }
+        println "------------"
+        String cloneFileName = new File(jarFileName).path + "-clone"
+        FileOutputStream fos = new FileOutputStream(cloneFileName)
+
+        String manifest
+        jarFile.entries().findAll { it.name == "META-INF/MANIFEST.MF" }.each {
+            manifest = jarFile.getInputStream(it).text
+        }
+        println "------------"
+        println manifest
+        println "------------"
+
+        JarOutputStream jarOutputStream = new JarOutputStream(fos,
+                new java.util.jar.Manifest(new ByteArrayInputStream(manifest.getBytes(java.nio.charset.Charset.forName("UTF-8")))))
+
+        println "------------"
+        byte[] readBuffer = new byte[2156]
+        jarFile.entries().findAll { !it.directory && !(it.name == "META-INF/MANIFEST.MF") && !(it.name.contains("TransactionalTestExecutionListener")) }.each {
+            println "adding ${it.name} to ${cloneFileName}"
+            jarOutputStream.putNextEntry(new JarEntry(it.name))
+            jarOutputStream << jarFile.getInputStream(it)
+        }
+        jarOutputStream.finish()
+        println "finished writing ${cloneFileName}"
+        println "------------"
+
+        println "from ${cloneFileName} to ${jarFileName}"
+        println "within ${file(cloneFileName).parentFile.path} is ${file(cloneFileName).name}"
+        println "rename ${file(cloneFileName).name} -> ${file(jarFileName).name}"
+
+        delete file(jarFileName)
+        copy {
+            from file(file(cloneFileName).parentFile.path)
+            into file(file(cloneFileName).parentFile.path)
+            rename { String fileName ->
+                fileName.replace(file(cloneFileName).name, file(jarFileName).name)
+            }
+        }
+        delete file(cloneFileName)
+        println "------------"
+        println "Removed 'TransactionalTestExecutionListener' from content of jar file ${jarFileName}:"
+        println "------------"
+        new ZipFile(jarFileName).entries().findAll{ !it.directory }.each { println it.name }
+        println "------------"
+    }
+}
diff --git a/ebr/org.springframework.test-4.2.9.RELEASE/org.springframework.test.mf b/ebr/org.springframework.test-4.2.9.RELEASE/org.springframework.test.mf
new file mode 100644
index 0000000..1347c46
--- /dev/null
+++ b/ebr/org.springframework.test-4.2.9.RELEASE/org.springframework.test.mf
@@ -0,0 +1,31 @@
+Bundle-SymbolicName: org.springframework.test
+Bundle-Name: Spring Test
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Import-Template:
+ javax.activation.*;version="0";resolution:=optional,
+ javax.el.*;version="[1.0.0, 3.0.0)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.persistence.*;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ javax.portlet.*;version="[2.0.0, 3.0.0)";resolution:=optional,
+ javax.servlet;version="[2.5.0, 4.0.0)";resolution:=optional,
+ javax.servlet.http;version="[2.5.0, 4.0.0)";resolution:=optional,
+ javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional,
+ javax.sql.*;version="0";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ junit.framework.*;version="[4.11.0, 5.0.0)";resolution:=optional,
+ org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
+ org.apache.taglibs.standard.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ org.aspectj.weaver.*;version="[1.7.1, 2.0.0)";resolution:=optional,
+ org.junit.*;version="[4.11.0, 5.0.0)";resolution:=optional,
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.testng.*;version="[6.5.2, 7.0.0)";resolution:=optional,
+ org.hamcrest.*;version="[1.3.0, 2.0.0)";resolution:=optional,
+ com.jayway.jsonpath.*;version="[0.8.1, 1.0.0)";resolution:=optional,
+ org.custommonkey.xmlunit.*;version="[1.2.0, 2.0.0)";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.test-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.test-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..b8eb387
--- /dev/null
+++ b/ebr/org.springframework.test-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,64 @@
+import java.util.jar.JarEntry
+import java.util.jar.JarOutputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import java.util.zip.ZipOutputStream
+
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-test', version: "${springframeworkVersion}"
+}
+
+task rewriteJar(dependsOn: 'bundlor') {
+    String jarFileName = file(buildDir.path + "/org.springframework.test-${springframeworkVersion}.jar").path
+    doLast() {
+        ZipFile jarFile = new ZipFile(jarFileName)
+        println "------------"
+        println "Cloning content of jar file ${jarFileName}:"
+        println "------------"
+        new ZipFile(jarFileName).entries().findAll{ !it.directory }.each { println it.name }
+        println "------------"
+        String cloneFileName = new File(jarFileName).path + "-clone"
+        FileOutputStream fos = new FileOutputStream(cloneFileName)
+
+        String manifest
+        jarFile.entries().findAll { it.name == "META-INF/MANIFEST.MF" }.each {
+            manifest = jarFile.getInputStream(it).text
+        }
+        println "------------"
+        println manifest
+        println "------------"
+
+        JarOutputStream jarOutputStream = new JarOutputStream(fos,
+                new java.util.jar.Manifest(new ByteArrayInputStream(manifest.getBytes(java.nio.charset.Charset.forName("UTF-8")))))
+
+        println "------------"
+        byte[] readBuffer = new byte[2156]
+        jarFile.entries().findAll { !it.directory && !(it.name == "META-INF/MANIFEST.MF") && !(it.name.contains("TransactionalTestExecutionListener")) }.each {
+            println "adding ${it.name} to ${cloneFileName}"
+            jarOutputStream.putNextEntry(new JarEntry(it.name))
+            jarOutputStream << jarFile.getInputStream(it)
+        }
+        jarOutputStream.finish()
+        println "finished writing ${cloneFileName}"
+        println "------------"
+
+        println "from ${cloneFileName} to ${jarFileName}"
+        println "within ${file(cloneFileName).parentFile.path} is ${file(cloneFileName).name}"
+        println "rename ${file(cloneFileName).name} -> ${file(jarFileName).name}"
+
+        delete file(jarFileName)
+        copy {
+            from file(file(cloneFileName).parentFile.path)
+            into file(file(cloneFileName).parentFile.path)
+            rename { String fileName ->
+                fileName.replace(file(cloneFileName).name, file(jarFileName).name)
+            }
+        }
+        delete file(cloneFileName)
+        println "------------"
+        println "Removed 'TransactionalTestExecutionListener' from content of jar file ${jarFileName}:"
+        println "------------"
+        new ZipFile(jarFileName).entries().findAll{ !it.directory }.each { println it.name }
+        println "------------"
+    }
+}
diff --git a/ebr/org.springframework.test-4.3.9.RELEASE/org.springframework.test.mf b/ebr/org.springframework.test-4.3.9.RELEASE/org.springframework.test.mf
new file mode 100644
index 0000000..69ded2a
--- /dev/null
+++ b/ebr/org.springframework.test-4.3.9.RELEASE/org.springframework.test.mf
@@ -0,0 +1,42 @@
+Bundle-SymbolicName: org.springframework.test
+Bundle-Name: Spring Test
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Import-Template:
+ javax.activation.*;version="0";resolution:=optional,
+ javax.el.*;version="[2.2.5, 4)";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.persistence.*;version="${javaxPersistenceVersion:[=.=, +1)}";resolution:=optional,
+ javax.portlet.*;version="[2.0.0, 3.0.0)";resolution:=optional,
+ javax.servlet;version="[2.5.0, 4.0.0)";resolution:=optional,
+ javax.servlet.http;version="[2.5.0, 4.0.0)";resolution:=optional,
+ javax.servlet.descriptor;version="[2.5.0, 4.0.0)";resolution:=optional,
+ javax.servlet.jsp.*;version="[2.1.0, 3.0.0)";resolution:=optional,
+ javax.sql.*;version="0";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ junit.framework.*;version="[4.11.0, 5.0.0)";resolution:=optional,
+ org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
+ org.apache.taglibs.standard.*;version="[1.1.0, 2.0.0)";resolution:=optional,
+ org.aspectj.weaver.*;version="[1.7.1, 2.0.0)";resolution:=optional,
+ org.junit.*;version="[4.11.0, 5.0.0)";resolution:=optional,
+ org.springframework.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.mock.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.test.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.testng.*;version="[6.5.2, 7.0.0)";resolution:=optional,
+ org.hamcrest.*;version="[1.3.0, 2.0.0)";resolution:=optional,
+ com.jayway.jsonpath.*;version="[0.8.1, 1.0.0)";resolution:=optional,
+ org.custommonkey.xmlunit.*;version="[1.2.0, 2.0.0)";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional,
+ com.gargoylesoftware.htmlunit.*;version="0";resolution:=optional,
+ javax.websocket.*;version="0";resolution:=optional,
+ org.apache.http.*;version="0";resolution:=optional,
+ org.openqa.selenium.*;version="0";resolution:=optional,
+ org.skyscreamer.jsonassert;version="0";resolution:=optional,
+ org.xml.sax;version="0";resolution:=optional
+Export-Template:
+ org.springframework.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.transaction-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.transaction-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..8e17c12
--- /dev/null
+++ b/ebr/org.springframework.transaction-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-tx', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.transaction-4.2.9.RELEASE/org.springframework.transaction.mf b/ebr/org.springframework.transaction-4.2.9.RELEASE/org.springframework.transaction.mf
new file mode 100644
index 0000000..4f96228
--- /dev/null
+++ b/ebr/org.springframework.transaction-4.2.9.RELEASE/org.springframework.transaction.mf
@@ -0,0 +1,37 @@
+Bundle-SymbolicName: org.springframework.transaction
+Bundle-Name: Spring Transaction
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Package:
+ com.ibm.websphere.uow;version="[6.0.2.17, 7)";resolution:=optional,
+ com.ibm.wsspi.uow;version="[6.0.2.17, 7)";resolution:=optional,
+ oracle.j2ee.transaction;version="0";resolution:=optional,
+ org.jboss.resource.work;version="0";resolution:=optional,
+ weblogic.transaction;version="0";resolution:=optional
+Import-Template:
+ javax.ejb.*;version="[3, 4)";resolution:=optional,
+ javax.management.*;version="0";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.resource.*;version="[1.5, 2)";resolution:=optional,
+ javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.dao.*;version="${springframeworkVersion}",
+ org.springframework.jca.*;version="${springframeworkVersion}",
+ org.springframework.transaction.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.transaction-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.transaction-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..8e17c12
--- /dev/null
+++ b/ebr/org.springframework.transaction-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-tx', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.transaction-4.3.9.RELEASE/org.springframework.transaction.mf b/ebr/org.springframework.transaction-4.3.9.RELEASE/org.springframework.transaction.mf
new file mode 100644
index 0000000..ab20435
--- /dev/null
+++ b/ebr/org.springframework.transaction-4.3.9.RELEASE/org.springframework.transaction.mf
@@ -0,0 +1,37 @@
+Bundle-SymbolicName: org.springframework.transaction
+Bundle-Name: Spring Transaction
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Package:
+ com.ibm.websphere.uow;version="[6.0.2.17, 7)";resolution:=optional,
+ com.ibm.wsspi.uow;version="[6.0.2.17, 7)";resolution:=optional,
+ oracle.j2ee.transaction;version="0";resolution:=optional,
+ org.jboss.resource.work;version="0";resolution:=optional,
+ weblogic.transaction;version="0";resolution:=optional
+Import-Template:
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ javax.ejb.*;version="[3, 4)";resolution:=optional,
+ javax.management.*;version="0";resolution:=optional,
+ javax.naming.*;version="0";resolution:=optional,
+ javax.resource.*;version="[1.5, 2)";resolution:=optional,
+ javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.dao.*;version="${springframeworkVersion}",
+ org.springframework.jca.*;version="${springframeworkVersion}",
+ org.springframework.transaction.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.web-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.web-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..71a51f6
--- /dev/null
+++ b/ebr/org.springframework.web-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-web', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.web-4.2.9.RELEASE/org.springframework.web.mf b/ebr/org.springframework.web-4.2.9.RELEASE/org.springframework.web.mf
new file mode 100644
index 0000000..ab8eb53
--- /dev/null
+++ b/ebr/org.springframework.web-4.2.9.RELEASE/org.springframework.web.mf
@@ -0,0 +1,59 @@
+Bundle-SymbolicName: org.springframework.web
+Bundle-Name: Spring Web
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ com.caucho.*;version="${hessianVersion:[=.=.=, +1)}";resolution:=optional,
+ com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
+ com.google.gson.*;version="${gsonVersion:[=.=.=, +1)}";resolution:=optional,
+ com.google.protobuf;version="${protobufJavaVersion:[=.=.=, +1)}";resolution:=optional,
+ com.googlecode.protobuf.format;version="${protobufJavaFormatVersion:[=.=.=, +1)}";resolution:=optional,
+ com.rometools.rome.*;version="${romeVersion:[=.=.=, +1)}";resolution:=optional,
+ com.squareup.okhttp.*;version="${okhttpVersion:[=.=.=, +1)}";resolution:=optional,
+ com.sun.net.*;version="0";resolution:=optional,
+ groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ io.netty.*;version="${nettyVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.activation.*;version="0";resolution:=optional,
+ javax.el.*;version="[2.2.5, 3)";resolution:=optional,
+ javax.faces.*;version="[2.2, 3)";resolution:=optional,
+ javax.imageio.*;version="0";resolution:=optional,
+ javax.jws.*;version="0";resolution:=optional,
+ javax.mail.*;version="[1.5, 2)";resolution:=optional,
+ javax.portlet.*;version="[2, 3)";resolution:=optional,
+ javax.servlet.*;version="[2.4, 4)",
+ javax.servlet.annotation;version="[3, 4)";resolution:=optional,
+ javax.servlet.jsp.*;version="[2.2.1, 3)";resolution:=optional,
+ javax.validation.*;version="[1, 2)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ org.apache.commons.fileupload.*;version="${commonsFileuploadVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.http.*;version="[4.1.0, 5.0.0)";resolution:=optional,
+ org.apache.log4j.*;version="${apacheLog4jVersion:[=.=.=, +1)}";resolution:=optional,
+ org.codehaus.jackson.*;version="[1.3.0, 2.0.0)";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.format.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.remoting.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.stereotype.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.http.*;version="${springframeworkVersion}",
+ org.springframework.remoting.*;version="${springframeworkVersion}",
+ org.springframework.web.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.web-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.web-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..71a51f6
--- /dev/null
+++ b/ebr/org.springframework.web-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-web', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.web-4.3.9.RELEASE/org.springframework.web.mf b/ebr/org.springframework.web-4.3.9.RELEASE/org.springframework.web.mf
new file mode 100644
index 0000000..a0497af
--- /dev/null
+++ b/ebr/org.springframework.web-4.3.9.RELEASE/org.springframework.web.mf
@@ -0,0 +1,62 @@
+Bundle-SymbolicName: org.springframework.web
+Bundle-Name: Spring Web
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ com.caucho.*;version="${hessianVersion:[=.=.=, +1)}";resolution:=optional,
+ com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
+ com.google.gson.*;version="${gsonVersion:[=.=.=, +1)}";resolution:=optional,
+ com.google.protobuf;version="${protobufJavaVersion:[=.=.=, +1)}";resolution:=optional,
+ com.googlecode.protobuf.format;version="${protobufJavaFormatVersion:[=.=.=, +1)}";resolution:=optional,
+ com.rometools.rome.*;version="${romeVersion:[=.=.=, +1)}";resolution:=optional,
+ com.squareup.okhttp.*;version="${okhttpVersion:[=.=.=, +1)}";resolution:=optional,
+ com.squareup.okhttp3.*;version="${okhttp3Version:[=.=.=, +1)}";resolution:=optional,
+ okhttp3.*;version="${okhttp3Version:[=.=.=, +1)}";resolution:=optional,
+ com.sun.net.*;version="0";resolution:=optional,
+ groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ io.netty.*;version="${nettyVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.activation.*;version="0";resolution:=optional,
+ javax.el.*;version="[2.2.5, 4)";resolution:=optional,
+ javax.faces.*;version="[2.2, 3)";resolution:=optional,
+ javax.imageio.*;version="0";resolution:=optional,
+ javax.jws.*;version="0";resolution:=optional,
+ javax.mail.*;version="[1.5, 2)";resolution:=optional,
+ javax.portlet.*;version="[2, 3)";resolution:=optional,
+ javax.servlet.*;version="[2.4, 4)",
+ javax.servlet.annotation;version="[3, 4)";resolution:=optional,
+ javax.servlet.jsp.*;version="[2.2.1, 3)";resolution:=optional,
+ javax.validation.*;version="[1, 2)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ javax.net.ssl;version="0";resolution:=optional,
+ org.apache.commons.fileupload.*;version="${commonsFileuploadVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.http.*;version="[4.1.0, 5.0.0)";resolution:=optional,
+ org.apache.log4j.*;version="${apacheLog4jVersion:[=.=.=, +1)}";resolution:=optional,
+ org.codehaus.jackson.*;version="[1.3.0, 2.0.0)";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.format.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.remoting.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.stereotype.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.http.*;version="${springframeworkVersion}",
+ org.springframework.remoting.*;version="${springframeworkVersion}",
+ org.springframework.web.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.webmvc-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.webmvc-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..ac18802
--- /dev/null
+++ b/ebr/org.springframework.webmvc-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-webmvc', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.webmvc-4.2.9.RELEASE/org.springframework.webmvc.mf b/ebr/org.springframework.webmvc-4.2.9.RELEASE/org.springframework.webmvc.mf
new file mode 100644
index 0000000..7252e6f
--- /dev/null
+++ b/ebr/org.springframework.webmvc-4.2.9.RELEASE/org.springframework.webmvc.mf
@@ -0,0 +1,62 @@
+Bundle-SymbolicName: org.springframework.webmvc
+Bundle-Name: Spring Web MVC
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Package:
+ org.springframework.cglib.reflect;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}"
+Import-Template:
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
+ com.lowagie.text.*;version="[2.0.8, 3)";resolution:=optional,
+ com.rometools.rome.*;version="${romeVersion:[=.=.=, +1)}";resolution:=optional,
+ com.sun.syndication.*;version="[1, 2)";resolution:=optional,
+ freemarker.*;version="[2.3.14, 3)";resolution:=optional,
+ groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ javax.activation.*;version="0";resolution:=optional,
+ javax.el.*;version="[2.2.5, 4)";resolution:=optional,
+ javax.script;version="0";resotion:=optional,
+ javax.sql.*;version="0";resolution:=optional,
+ javax.servlet.*;version="[3.0.1, 4)",
+ javax.servlet.jsp.*;version="[2.2.1, 3)";resolution:=optional,
+ javax.servlet.jsp.jstl.*;version="[1.2.1, 2)";resolution:=optional,
+ javax.validation.*;version="[1, 2)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ javax.xml.bind.*;version="0";resolution:=optional,
+ jxl.*;version="${jxlVersion:[=.=.=, +1)}";resolution:=optional,
+ net.sf.jasperreports.*;version="${jasperreportsVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.poi.*;version="${poiVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.tiles.*;version="[2.2.2, 4)";resolution:=optional,
+ org.apache.tiles.request.*;version="[1, 2)";resolution:=optional,
+ org.apache.velocity.*;version="${velocityVersion:[=.=.=, +1)}";resolution:=optional,
+ org.codehaus.jackson.*;version="[1.3.0, 2)";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cache.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.format.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.http.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.objenesis.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scripting.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.webjars.*;version="${webjarsVersion:[=.=.=, +1)}";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional,
+ edu.emory.mathcs.backport.*;version="[3, 4)";resolution:=optional
+Export-Template:
+ org.springframework.web.servlet.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.webmvc-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.webmvc-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..ac18802
--- /dev/null
+++ b/ebr/org.springframework.webmvc-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-webmvc', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.webmvc-4.3.9.RELEASE/org.springframework.webmvc.mf b/ebr/org.springframework.webmvc-4.3.9.RELEASE/org.springframework.webmvc.mf
new file mode 100644
index 0000000..7252e6f
--- /dev/null
+++ b/ebr/org.springframework.webmvc-4.3.9.RELEASE/org.springframework.webmvc.mf
@@ -0,0 +1,62 @@
+Bundle-SymbolicName: org.springframework.webmvc
+Bundle-Name: Spring Web MVC
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Package:
+ org.springframework.cglib.reflect;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}"
+Import-Template:
+ org.aopalliance.*;version="${orgAopAllianceVersion:[=.=.=, +1)}",
+ com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
+ com.lowagie.text.*;version="[2.0.8, 3)";resolution:=optional,
+ com.rometools.rome.*;version="${romeVersion:[=.=.=, +1)}";resolution:=optional,
+ com.sun.syndication.*;version="[1, 2)";resolution:=optional,
+ freemarker.*;version="[2.3.14, 3)";resolution:=optional,
+ groovy.*;version="${groovyVersion:[=.=.=, +1)}";resolution:="optional",
+ javax.activation.*;version="0";resolution:=optional,
+ javax.el.*;version="[2.2.5, 4)";resolution:=optional,
+ javax.script;version="0";resotion:=optional,
+ javax.sql.*;version="0";resolution:=optional,
+ javax.servlet.*;version="[3.0.1, 4)",
+ javax.servlet.jsp.*;version="[2.2.1, 3)";resolution:=optional,
+ javax.servlet.jsp.jstl.*;version="[1.2.1, 2)";resolution:=optional,
+ javax.validation.*;version="[1, 2)";resolution:=optional,
+ javax.xml.*;version="0";resolution:=optional,
+ javax.xml.bind.*;version="0";resolution:=optional,
+ jxl.*;version="${jxlVersion:[=.=.=, +1)}";resolution:=optional,
+ net.sf.jasperreports.*;version="${jasperreportsVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.poi.*;version="${poiVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.tiles.*;version="[2.2.2, 4)";resolution:=optional,
+ org.apache.tiles.request.*;version="[1, 2)";resolution:=optional,
+ org.apache.velocity.*;version="${velocityVersion:[=.=.=, +1)}";resolution:=optional,
+ org.codehaus.jackson.*;version="[1.3.0, 2)";resolution:=optional,
+ org.springframework.aop.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cache.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.cglib.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.expression.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.format.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.http.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.objenesis.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.oxm.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scripting.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.xml.sax.*;version="0";resolution:=optional,
+ org.webjars.*;version="${webjarsVersion:[=.=.=, +1)}";resolution:=optional,
+ org.w3c.dom.*;version="0";resolution:=optional,
+ edu.emory.mathcs.backport.*;version="[3, 4)";resolution:=optional
+Export-Template:
+ org.springframework.web.servlet.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..4f47288
--- /dev/null
+++ b/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-webmvc-portlet', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/org.springframework.webmvc.portlet.mf b/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/org.springframework.webmvc.portlet.mf
new file mode 100644
index 0000000..9b5b967
--- /dev/null
+++ b/ebr/org.springframework.webmvc.portlet-4.2.9.RELEASE/org.springframework.webmvc.portlet.mf
@@ -0,0 +1,29 @@
+Bundle-SymbolicName: org.springframework.webmvc.portlet
+Bundle-Name: Spring Web MVC Portlet
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ javax.portlet.*;version="[2, 3)",
+ javax.servlet.*;version="[3.0.1, 4)",
+ javax.xml.*;version="0";resolution:=optional,
+ org.apache.commons.fileupload.*;version="${commonsFileuploadVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.http.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.xml.sax.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.web.portlet.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..4f47288
--- /dev/null
+++ b/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-webmvc-portlet', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/org.springframework.webmvc.portlet.mf b/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/org.springframework.webmvc.portlet.mf
new file mode 100644
index 0000000..9b5b967
--- /dev/null
+++ b/ebr/org.springframework.webmvc.portlet-4.3.9.RELEASE/org.springframework.webmvc.portlet.mf
@@ -0,0 +1,29 @@
+Bundle-SymbolicName: org.springframework.webmvc.portlet
+Bundle-Name: Spring Web MVC Portlet
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ javax.portlet.*;version="[2, 3)",
+ javax.servlet.*;version="[3.0.1, 4)",
+ javax.xml.*;version="0";resolution:=optional,
+ org.apache.commons.fileupload.*;version="${commonsFileuploadVersion:[=.=.=, +1)}";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.http.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.jndi.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.ui.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.validation.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.xml.sax.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.web.portlet.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.websocket-4.2.9.RELEASE/build.gradle b/ebr/org.springframework.websocket-4.2.9.RELEASE/build.gradle
new file mode 100644
index 0000000..a86cf8e
--- /dev/null
+++ b/ebr/org.springframework.websocket-4.2.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-websocket', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.websocket-4.2.9.RELEASE/org.springframework.websocket.mf b/ebr/org.springframework.websocket-4.2.9.RELEASE/org.springframework.websocket.mf
new file mode 100644
index 0000000..6935ab3
--- /dev/null
+++ b/ebr/org.springframework.websocket-4.2.9.RELEASE/org.springframework.websocket.mf
@@ -0,0 +1,33 @@
+Bundle-SymbolicName: org.springframework.websocket
+Bundle-Name: Spring Websocket
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
+ io.undertow.*;version="${undertowVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.servlet.*;version="[3.1, 4)";resolution:=optional,
+ javax.websocket.*;version="[1, 2)";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.tomcat.websocket.server;version="[8.0.30, 9)";resolution:=optional,
+ org.eclipse.jetty.*;version="[9.3.6.v20151106, 10)";resolution:=optional,
+ org.glassfish.tyrus.*;version="[1.3.5, 2)";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.http.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.messaging.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0";resolution:=optional,
+ org.xnio.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.web.socket.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/org.springframework.websocket-4.3.9.RELEASE/build.gradle b/ebr/org.springframework.websocket-4.3.9.RELEASE/build.gradle
new file mode 100644
index 0000000..a86cf8e
--- /dev/null
+++ b/ebr/org.springframework.websocket-4.3.9.RELEASE/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    sourceBundle group: 'org.springframework', name: 'spring-websocket', version: "${springframeworkVersion}"
+}
diff --git a/ebr/org.springframework.websocket-4.3.9.RELEASE/org.springframework.websocket.mf b/ebr/org.springframework.websocket-4.3.9.RELEASE/org.springframework.websocket.mf
new file mode 100644
index 0000000..6935ab3
--- /dev/null
+++ b/ebr/org.springframework.websocket-4.3.9.RELEASE/org.springframework.websocket.mf
@@ -0,0 +1,33 @@
+Bundle-SymbolicName: org.springframework.websocket
+Bundle-Name: Spring Websocket
+Bundle-Vendor: Eclipse Virgo
+Bundle-ManifestVersion: 2
+Bundle-Version: ${springframeworkVersion}
+Import-Template:
+ com.fasterxml.jackson.*;version="${jacksonVersion:[=.=.=, +1)}";resolution:=optional,
+ io.undertow.*;version="${undertowVersion:[=.=.=, +1)}";resolution:=optional,
+ javax.servlet.*;version="[3.1, 4)";resolution:=optional,
+ javax.websocket.*;version="[1, 2)";resolution:=optional,
+ org.apache.commons.logging.*;version="${commonsLoggingVersion:[=.=.=, +1)}",
+ org.apache.tomcat.websocket.server;version="[8.0.30, 9)";resolution:=optional,
+ org.eclipse.jetty.*;version="[9.3.6.v20151106, 10)";resolution:=optional,
+ org.glassfish.tyrus.*;version="[1.3.5, 2)";resolution:=optional,
+ org.springframework.beans.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.context.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.core.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.http.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.lang.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.messaging.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}";resolution:=optional,
+ org.springframework.scheduling.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.stereotype;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.util.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.springframework.web.*;version="${springframeworkVersion:[=.=.=.=, =.=.=.=]}",
+ org.w3c.dom.*;version="0";resolution:=optional,
+ org.xnio.*;version="0";resolution:=optional
+Export-Template:
+ org.springframework.web.socket.*;version="${springframeworkVersion}"
+Ignored-Existing-Headers:
+ Bnd-LastModified,
+ Import-Package,
+ Export-Package,
+ Tool
diff --git a/ebr/settings.gradle b/ebr/settings.gradle
new file mode 100644
index 0000000..76a421c
--- /dev/null
+++ b/ebr/settings.gradle
@@ -0,0 +1,21 @@
+include "org.springframework.aop-${springframeworkVersion}"
+include "org.springframework.aspects-${springframeworkVersion}"
+include "org.springframework.beans-${springframeworkVersion}"
+include "org.springframework.context-${springframeworkVersion}"
+include "org.springframework.context.support-${springframeworkVersion}"
+include "org.springframework.core-${springframeworkVersion}"
+include "org.springframework.expression-${springframeworkVersion}"
+include "org.springframework.jdbc-${springframeworkVersion}"
+include "org.springframework.jms-${springframeworkVersion}"
+include "org.springframework.messaging-${springframeworkVersion}"
+include "org.springframework.orm-${springframeworkVersion}"
+include "org.springframework.oxm-${springframeworkVersion}"
+include "org.springframework.transaction-${springframeworkVersion}"
+include "org.springframework.web-${springframeworkVersion}"
+include "org.springframework.webmvc-${springframeworkVersion}"
+include "org.springframework.webmvc.portlet-${springframeworkVersion}"
+include "org.springframework.websocket-${springframeworkVersion}"
+include "org.springframework.test-${springframeworkVersion}"
+include "org.aspectj.weaver-${aspectjVersion}"
+include "com.squareup.okio-${okioVersion}"
+include "com.squareup.okhttp3-${okhttp3Version}"
diff --git a/ebr/src/test/java/org/eclipse/virgo/ebr/AbstractBaseTest.java b/ebr/src/test/java/org/eclipse/virgo/ebr/AbstractBaseTest.java
new file mode 100644
index 0000000..e64a491
--- /dev/null
+++ b/ebr/src/test/java/org/eclipse/virgo/ebr/AbstractBaseTest.java
@@ -0,0 +1,48 @@
+package org.eclipse.virgo.ebr;
+
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+
+import javax.inject.Inject;
+
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeNotNull;
+import static org.osgi.framework.Bundle.ACTIVE;
+
+/**
+ * Abstract test class to be extended by all test implementations.
+ * <p>
+ * Created by dam on 6/14/17.
+ */
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public abstract class AbstractBaseTest {
+
+    public static final String MIRROR_GROUP = "org.eclipse.virgo.mirrored";
+
+    @Inject
+    protected BundleContext bundleContext;
+
+    public abstract Option[] config();
+
+    protected void assertBundleActive(String symbolicName) throws BundleException {
+        assumeNotNull(symbolicName);
+        assumeFalse(symbolicName.isEmpty());
+        for (Bundle b : this.bundleContext.getBundles()) {
+            if (symbolicName.equals(b.getSymbolicName())) {
+                if (ACTIVE != b.getState()) {
+                    b.start(); // start the bundle so we get the exception
+                }
+                return;
+            }
+        }
+        fail("Bundle with symbolicName [" + symbolicName + "] could not be found.");
+    }
+}
diff --git a/ebr/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java b/ebr/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java
new file mode 100644
index 0000000..81e0abf
--- /dev/null
+++ b/ebr/src/test/java/org/eclipse/virgo/ebr/OkHttp3Test.java
@@ -0,0 +1,43 @@
+package org.eclipse.virgo.ebr;
+
+import org.junit.Test;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+
+import static org.ops4j.pax.exam.CoreOptions.*;
+
+/**
+ * Test class testing OkHttp3 bundle resolution.
+ * <p>
+ * Created by dam on 6/14/17.
+ */
+public class OkHttp3Test extends AbstractBaseTest {
+
+    private static final String OKIO = "com.squareup.okio";
+    private static final String OKIO_VERSION = "1.13.0";
+
+    private static final String OKHTTP3 = "com.squareup.okhttp3";
+    private static final String OKHTTP3_VERSION = "3.8.0";
+
+    @Configuration
+    @Override
+    public Option[] config() {
+        return options(
+                // maven local
+                mavenBundle(MIRROR_GROUP, OKIO, OKIO_VERSION),
+                mavenBundle(MIRROR_GROUP, OKHTTP3, OKHTTP3_VERSION),
+                // specify junit bundles
+                junitBundles()
+        );
+    }
+
+    @Test
+    public void testOkio() throws Exception {
+        assertBundleActive(OKIO);
+    }
+
+    @Test
+    public void testOkHttp3() throws Exception {
+        assertBundleActive(OKHTTP3);
+    }
+}
diff --git a/ebr/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java b/ebr/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java
new file mode 100644
index 0000000..b299a0e
--- /dev/null
+++ b/ebr/src/test/java/org/eclipse/virgo/ebr/SpringFrameworkTest.java
@@ -0,0 +1,162 @@
+package org.eclipse.virgo.ebr;
+
+import org.junit.Test;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+
+import static org.ops4j.pax.exam.CoreOptions.*;
+
+/**
+ * Test class testing Spring Framework bundle resolution.
+ * <p>
+ * Created by dam on 6/9/17.
+ */
+public class SpringFrameworkTest extends AbstractBaseTest {
+
+    private static final String ASPECTJ_WEAVER = "org.aspectj.weaver";
+    private static final String ASPECTJ_WEAVER_VERSION = "1.8.10";
+
+    private static final String SF_VERSION = "4.3.9.RELEASE";
+    private static final String SF_PREFIX = "org.springframework.";
+    private static final String SF_CORE = SF_PREFIX + "core";
+    private static final String SF_BEANS = SF_PREFIX + "beans";
+    private static final String SF_AOP = SF_PREFIX + "aop";
+    private static final String SF_ASPECTS = SF_PREFIX + "aspects";
+    private static final String SF_EXPRESSION = SF_PREFIX + "expression";
+    private static final String SF_CONTEXT = SF_PREFIX + "context";
+    private static final String SF_CONTEXT_SUPPORT = SF_PREFIX + "context.support";
+    private static final String SF_TRANSACTION = SF_PREFIX + "transaction";
+    private static final String SF_JDBC = SF_PREFIX + "jdbc";
+    private static final String SF_MESSAGING = SF_PREFIX + "messaging";
+    private static final String SF_JMS = SF_PREFIX + "jms";
+    private static final String SF_ORM = SF_PREFIX + "orm";
+    private static final String SF_OXM = SF_PREFIX + "oxm";
+    private static final String SF_WEB = SF_PREFIX + "web";
+    private static final String SF_WEBMVC = SF_PREFIX + "webmvc";
+    private static final String SF_WEBMVC_PORTLET = SF_PREFIX + "webmvc.portlet";
+    private static final String SF_WEBSOCKET = SF_PREFIX + "websocket";
+
+    @Configuration
+    @Override
+    public Option[] config() {
+        return options(
+                // spring framework dependencies
+                mavenBundle("commons-logging", "commons-logging", "1.2"),
+                mavenBundle("javax.servlet", "javax.servlet-api", "3.1.0"),
+                mavenBundle("javax.portlet", "portlet-api", "2.0"),
+                bundle("http://build.eclipse.org/rt/virgo/ivy/bundles/release/org.eclipse.virgo.mirrored/oevm.org.aopalliance/1.0.0/oevm.org.aopalliance-1.0.0.jar"),
+                bundle("http://build.eclipse.org/rt/virgo/ivy/bundles/release/org.eclipse.virgo.mirrored/javax.jms/1.1.0.v201205091237/javax.jms-1.1.0.v201205091237.jar"),
+                // maven local
+                mavenBundle(MIRROR_GROUP, ASPECTJ_WEAVER, ASPECTJ_WEAVER_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_CORE, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_BEANS, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_AOP, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_ASPECTS, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_EXPRESSION, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_CONTEXT, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_CONTEXT_SUPPORT, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_TRANSACTION, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_JDBC, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_MESSAGING, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_JMS, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_ORM, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_OXM, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_WEB, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_WEBMVC, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_WEBMVC_PORTLET, SF_VERSION),
+                mavenBundle(MIRROR_GROUP, SF_WEBSOCKET, SF_VERSION),
+                // specify junit bundles
+                junitBundles()
+        );
+    }
+
+    @Test
+    public void testAspectjWeaver() throws Exception {
+        assertBundleActive(ASPECTJ_WEAVER);
+    }
+
+    @Test
+    public void testSpringCore() throws Exception {
+        assertBundleActive(SF_CORE);
+    }
+
+    @Test
+    public void testSpringBeans() throws Exception {
+        assertBundleActive(SF_BEANS);
+    }
+
+    @Test
+    public void testSpringAop() throws Exception {
+        assertBundleActive(SF_AOP);
+    }
+
+    @Test
+    public void testSpringAspects() throws Exception {
+        assertBundleActive(SF_ASPECTS);
+    }
+
+    @Test
+    public void testSpringExpression() throws Exception {
+        assertBundleActive(SF_EXPRESSION);
+    }
+
+    @Test
+    public void testSpringContext() throws Exception {
+        assertBundleActive(SF_CONTEXT);
+    }
+
+    @Test
+    public void testSpringContextSupport() throws Exception {
+        assertBundleActive(SF_CONTEXT_SUPPORT);
+    }
+
+    @Test
+    public void testSpringTransaction() throws Exception {
+        assertBundleActive(SF_TRANSACTION);
+    }
+
+    @Test
+    public void testSpringJdbc() throws Exception {
+        assertBundleActive(SF_JDBC);
+    }
+
+    @Test
+    public void testSpringMessaging() throws Exception {
+        assertBundleActive(SF_MESSAGING);
+    }
+
+    @Test
+    public void testSpringJsm() throws Exception {
+        assertBundleActive(SF_JMS);
+    }
+
+    @Test
+    public void testSpringOrm() throws Exception {
+        assertBundleActive(SF_ORM);
+    }
+
+    @Test
+    public void testSpringOxm() throws Exception {
+        assertBundleActive(SF_OXM);
+    }
+
+    @Test
+    public void testSpringWeb() throws Exception {
+        assertBundleActive(SF_WEB);
+    }
+
+    @Test
+    public void testSpringWebMvc() throws Exception {
+        assertBundleActive(SF_WEBMVC);
+    }
+
+    @Test
+    public void testSpringWebMvcPortlet() throws Exception {
+        assertBundleActive(SF_WEBMVC_PORTLET);
+    }
+
+    @Test
+    public void testSpringWebsocket() throws Exception {
+        assertBundleActive(SF_WEBSOCKET);
+    }
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..b990802
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,370 @@
+# will be replaced before running the bundlor task
+version = @VIRGO.VERSION@
+
+# Eclipse JDT Core Batch Compiler
+ecjVersion = 4.6.1
+
+# CQ4129 (PB CQ3480)
+junitVersion = 4.7
+
+# CQ4132 (PB CQ1887)
+easymockVersion = 2.3
+
+# PaxExam
+# CQ8541
+paxExamJunit4Version = 4.1.0
+paxExamContainerNativeVersion = 4.1.0
+paxExamLinkMvnVersion = 4.1.0
+paxUrlAetherVersion = 1.3.5
+paxUrlWrapVersion = 2.3.0
+
+# CQ 13678 SLF4J jcl-over-slf4j Version: 1.7.25
+# CQ 13367 SLF4J jul-to-slf4j Version: 1.7.25
+# CQ 13680 SLF4J log4j-over-slf4j Version: 1.7.25
+# CQ 13637 SLF4J slf4j-api Version: 1.7.25
+# CQ 12540 SLF4J slf4j-nop version 1.7.22 and later (incl. 1.7.25)
+slf4jVersion = 1.7.25
+# CQ 13636 - Logback Classic Version 1.2.3
+# CQ 13635 - Logback Core Version: 1.2.3
+logbackVersion = 1.2.3
+
+# Eclipse Kepler 4.3.2 (SR2)
+equinoxVersion = 3.9.1.v20140110-1610
+osgiServicesVersion = 3.3.100.v20130513-1956
+osgiEnterpriseVersion = 4.2.0.v201108120515
+
+equinoxAppVersion = 1.3.100.v20130327-1442
+# ConfigAdminService
+equinoxCmVersion = 1.0.400.v20130327-1442
+# Eclipse Mars.2
+# requires 'package org.osgi.framework 1.8.0'
+# equinoxCmVersion = 1.1.0.v20131021-1936
+equinoxCommonVersion = 3.6.200.v20130402-1505
+# DeclarativeService
+#equinoxDsVersion = 1.4.101.v20130813-1853
+#equinoxDsVersion = 1.4.400.v20160226-2036
+equinoxDsVersion = 1.4.200.v20131126-2331
+equinoxConsoleVersion = 1.0.100.v20130429-0953
+equinoxConsoleSshVersion = 1.0.0.v20130515-2026
+equinoxEventVersion = 1.3.0.v20130327-1442
+equinoxFrameworkadminEquinoxVersion = 1.0.500.v20130327-2119
+equinoxFrameworkadminVersion = 2.0.100.v20130327-2119
+
+#equinoxHttpJettyVersion = 3.0.200.v20131021-1843
+equinoxHttpJettyVersion = 3.0.100.v20130327-1442
+#equinoxHttpServletVersion = 1.1.500.v20140318-1755
+equinoxHttpServletVersion = 1.1.400.v20130418-1354
+
+# Note: Used by Virgo Build Tools, too
+equinoxLauncherVersion = 1.3.0.v20130327-1440
+equinoxPreferencesVersion = 3.5.100.v20130422-1538
+equinoxRegionVersion = 1.1.101.v20130722-1314
+equinoxRegionExportedPackageVersion = 1.1.0
+equinoxRegistryVersion = 3.5.301.v20130717-1549
+equinoxSecurityVersion = 1.2.0.v20130424-1801
+equinoxSimpleConfiguratorVersion = 1.0.400.v20130327-2119
+equinoxSimpleConfiguratorManipulatorVersion = 2.0.0.v20130327-2119
+equinoxUtilVersion = 1.0.500.v20130404-1337
+
+eclipseCoreContenttypeVersion = 3.4.200.v20130326-1255
+eclipseCoreJobsVersion = 3.5.300.v20130429-1813
+eclipseCoreNetVersion = 1.2.200.v20130430-1352
+eclipseCoreRuntimeVersion = 3.9.100.v20131218-1515
+
+eclipseJdtCoreCompilerBatchVersion = 3.10.0.v20140604-1726
+
+eclipseEcfIdentityVersion = 3.2.0.v20130604-1622
+eclipseEcfFiletransferVersion = 5.0.0.v20130604-1622
+eclipseEcfProviderFiletransferVersion = 3.2.0.v20130604-1622
+eclipseEcfSslVersion = 1.1.0.v20130604-1622
+eclipseEcfVersion = 3.2.0.v20130604-1622
+
+sat4jCoreVersion = 2.3.5.v201308161310
+sat4jPbVersion = 2.3.5.v201308161310
+
+p2ArtifactRepositoryVersion = 1.1.200.v20130515-2028
+p2ConsoleVersion = 1.0.300.v20130327-2119
+p2CoreVersion = 2.3.0.v20130327-2119
+p2DirectorVersion = 2.3.1.v20140221-1852
+p2EngineVersion = 2.3.0.v20130526-2122
+p2GarbageCollectorVersion = 1.0.200.v20130327-2119
+p2JarProcessorVersion = 1.0.300.v20130327-2119
+p2MetadataVersion = 2.2.0.v20130523-1557
+p2MetadataRepositoryVersion = 1.2.100.v20130327-2119
+p2PublisherVersion = 1.3.0.v20140129-1405
+p2PublisherEclipseVersion = 1.1.200.v20130516-1953
+p2RepositoryVersion = 2.3.0.v20130412-2032
+p2TouchpointEclipseVersion = 2.1.200.v20130327-2119
+p2TouchpointNativesVersion = 1.1.100.v20130327-2119
+p2TransportEcfVersion = 1.1.0.v20130516-1858
+
+#CQ5528
+apacheSshdCoreVersion = 0.5.0.v201108120515
+#CQ6402 - command, shell and runtime
+gogoCommandVersion = 0.10.0.v201209301215
+gogoRuntimeVersion = 0.10.0.v201209301036
+gogoShellVersion = 0.10.0.v201211091412
+#CQ5527
+minaCoreVersion = 2.0.2.v201108120515
+
+#CQ4033
+orgAopAllianceVersion = 1.0.0
+
+geminiBlueprintVersion = 2.1.0.JAVA7
+
+#CQ 13690 org.springframework.aop
+#CQ 13691 org.springframework.aspects
+#CQ 13692 org.springframework.beans
+#CQ 13693 org.springframework.context
+#CQ 13694 org.springframework.context.support
+#CQ 13695 org.springframework.core
+#CQ 13696 org.springframework.expression
+#CQ 13697 org.springframework.jdbc
+#CQ 13698 org.springframework.jms
+#CQ 13699 org.springframework.messaging
+#CQ 13700 org.springframework.orm
+#CQ 13701 org.springframework.oxm
+#CQ 13702 org.springframework.transaction
+#CQ 13703 org.springframework.web
+#CQ 13704 org.springframework.webmvc
+#CQ 13705 org.springframework.webmvc.portlet
+#CQ 13706 org.springframework.websocket
+springframeworkVersion = 4.3.9.RELEASE
+
+geminiManagementVersion = 1.0.5.RELEASE
+geminiWebVersion = 3.0.3.RELEASE
+
+objectwebAsmVersion = 3.2.0.v200909071300
+scannotationVersion = 1.0.2.v201205170710
+
+commonsBeanutilsVersion = 1.8.0.v201205091237
+# CQ 10288 (PB CQ9217)
+commonsCodecVersion = 1.10.0
+commonsCliVersion = 1.2.0
+# CQ12542 (PB CQ10386)
+commonsCollectionsVersion = 3.2.2
+commonsDbcpVersion = 1.4.0.v201204271417
+# CQ12541 (PB CQ12051)
+commonsFileuploadVersion = 1.3.2
+# CQ3956 (PB CQ1765)
+commonsHttpClientVersion = 3.1.0
+
+# CQ9555 (PB Orbit CQ8938)
+httpcomponentsCoreVersion = 4.3.3
+# CQ9556 (PB Orbit CQ8934)
+httpcomponentsClientVersion = 4.3.6
+
+# CQ13049
+commonsIoVersion = 2.5
+# CQ7151
+commonsLangVersion = 3.1.0
+# CQ12625 (PB CQ10162)
+commonsLoggingVersion = 1.2.0
+# CQ6102
+commonsPoolVersion = 1.6.0.v201204271246
+
+apacheTaglibsStandardVersion = 1.1.2.v20110517
+
+apacheBvalVersion = 0.5.0
+# TODO update derby to apacheDerbyVersion = 10.12.1.1 required by spring-orm
+apacheDerbyVersion = 10.8.2.2_v201211210650
+# CQ4833 log4j Version: 1.2.15 (Subset - see all comments) (PB Orbit CQ3560)
+# TODO move forward to 1.2.17 used in spring-core
+apacheLog4jVersion = 1.2.15.v201012070815
+# CQ7162 OpenEJB (Subset) Version: 4.5.2
+apacheOpenejbVersion = 4.5.2
+apacheOpenejbCoreVersion = 4.5.2.virgo-3
+
+# CQ7145 openwebbeans (Subset) Version: 1.1.7
+apacheOpenwebbeansVersion = 1.1.7.v201304201405
+apacheOpenwebbeansEEVersion = 1.1.7.v201304200545
+apacheOpenwebbeansTomcat7Version = 1.1.7.v201304201405-virgo-1
+
+# CQ7149 XBean (Subset) Version: 3.12
+apacheXBeanAsmVersion = 3.12.0.v201304200545
+apacheXBeanBundleutilsVersion = 3.12.0.v201304200545
+apacheXBeanFinderVersion = 3.12.0.v201304201405
+apacheXBeanNamingVersion = 3.12.0.v201304201405
+apacheXBeanReflectVersion = 3.12.0.v201304201405
+
+# CQ7147 Java Server Faces Version: 2.1.18
+# TODO What's the difference of javax.faces and com.sun.faces - do we need both?
+glassfishJavaxFacesVersion = 2.1.18.v201304200545
+glassfishComSunFacesVersion = 2.1.18.v201304210537-virgo-2
+
+geronimoComponentsConnectorVersion = 3.1.1.v201205170953
+geronimoComponentsTransactionVersion = 3.1.1.v201205170710
+geronimoSpecsJ2eeManagementVersion = 1.0.0.v201205091237
+geronimoSpecsOsgiLocatorVersion = 1.1.0.v201205170953
+geronimoSpecsOsgiRegistryVersion = 1.1.0.v201205170710
+
+javaxActivationVersion = 1.1.0.v201108011116
+javaxAnnotationVersion= 1.2.0.v201401042248
+# CQ6093 ejb-api Version: 3.1.1
+javaxEjbVersion=3.1.1.v201204261316
+javaxElVersion=3.0.0.20170128
+# CQ6090 (PB Orbit CQ3578)
+javaxInjectVersion = 1.0.0.v20091030
+javaxJmsVersion=1.1.0.v201205091237
+# CQ12547 (PB CQ11275)
+javaxMailVersion = 1.5.5
+# TODO create CQ?
+# Available from Eclipse Link p2 site http://download.eclipse.org/rt/eclipselink/updates/2.4.2.v20130514-5956486/
+javaxPersistenceVersion=2.1.0.v201304241213
+# CQ3940
+javaxPortletVersion=2.0.0
+javaxResourceVersion=1.6.0.v201204270900
+javaxSecurityAuthMessageVersion=1.1.0.20170128
+# TODO - check if a CQ is missing
+javaxSecurityJaccVersion=1.4.0.v201205031350
+# CQ6246 Jetty servlet-api Version: 3.0 (PB CQ3217)
+# CQ5123 Glassfish servlet-api Version: 3.1-b33 (PB CQ4712)
+javaxServletVersion = 3.1.0.20170128
+# CQ12626 JSP 2.3 FINAL (API 2.3.1 & Impl 2.3.2) (PB Orbit CQ 7295)
+# TODO upgrade to 2.3.1 ?!
+javaxServletJspVersion = 2.3.0.20170128
+# CQ5435 (PB Orbit CQ2334)
+# TODO upgrade to 1.2 needed by spring-aspects, spring-jdbc, spring-jms, spring-orm, spring-tx
+# CQ12544 javax.servlet.jsp.jstl api Version: 1.2.1
+javaxServletJspJstlApiVersion=1.2.1
+# CQ12543 JSP Standard Tag Library Version 1.2.5-b03
+javaxServletJspJstlImplVersion=1.2.5-b03
+javaxServletJspJstlImplOsgiVersion=1.2.5.b03
+# CQ12565 Java Interceptor API 1.2
+javaxInterceptorVersion = 1.2
+# CQ12546 Java Transaction API Version: 1.2 (PB Orbit CQ7296)
+javaxTransactionVersion = 1.2
+# CQ6095 Bean Validation API Version: 1.0.0 GA (PB CQ3570)
+javaxValidationVersion=1.0.0.GA_v201205091237
+# Covered by Tomcat CQ
+javaxWebsocketVersion=1.1.0.20170128
+javaxWsdlVersion=1.6.2.v201012040545
+javaxWsRsVersion=1.1.1.v20101004-1200
+javaxXmlRpcVersion=1.1.0.v201005080400
+
+eclipsePersistenceAntlrVersion = 3.2.0.v201206041011
+eclipsePersistenceAsmVersion = 3.3.1.v201206041142
+# TODO update to 2.4.2 required by spring-orm
+eclipsePersistenceCoreVersion = 2.4.1.v20121003-ad44345
+eclipsePersistenceJpaVersion = 2.4.1.v20121003-ad44345
+eclipsePersistenceJpaJpqlVersion = 2.0.1.v20121003-ad44345
+
+# CQ6092 cdi-api Version: 1.0 (Context and Dependency Injection API from JSR 299)
+cdiApiVersion = 1.0.0.v201105160744
+javassistVersion = 3.17.1.GA
+# CQ6100 Java Open Transaction Manager (JOTM) 2.1.9 *Subset*
+jotmVersion = 2.1.9.v201204271116
+# TODO - update to 2.2.2 required by spring-context-support
+quartzVersion = 1.6.0.v201204271540
+
+# CQ 11207
+# CQ 13683
+jolokiaVersion = 1.3.6
+
+aspectjVersion = 1.8.10
+
+# Delivered with RAP 2.3.2
+jettyVersion = 8.1.16.v20140903
+# TODO move forward to latest release (as of April 8th 2016)
+#jettyVersion = 8.1.18.v20150929
+
+# CQ13795 Apache Tomcat 8.5.16 (PB CQ13794)
+apacheCatalinaVersion = 8.5.16
+
+# CQ7699 (PB Orbit CQ6772)
+mozillaJavascriptVersion = 1.7.4.v201209142200
+# CQ7126 Hibernate Version: 4.1.0
+# TODO - upgrade to 4.3.2.Final used in spring-context
+hibernateVersion = 4.1.0.Final
+
+# RAP 2.3.2
+eclipseCoreCommandsVersion = 3.6.100.v20140528-1422
+eclipseCoreDatabindingObservableVersion = 1.4.1.v20140210-1835
+eclipseCoreDatabindingPropertyVersion = 1.4.200.v20140214-0004
+eclipseCoreDatabindingVersion = 1.4.2.v20140729-1044
+icuBaseVersion = 52.1.1.v201501240615
+
+rapRwtVersion = 2.3.2.20150128-1013
+rapRwtOsgiVersion = 2.3.2.20150119-1706
+rapJfaceVersion = 2.3.2.20150119-1706
+rapJfaceDatabindingVersion = 2.3.2.20150119-1706
+rapUiVersion = 2.3.2.20150119-1706
+
+# performance-tests
+#    jwebunitVersion = 2.2.0
+# TODO create CQ for version 3.2?
+jwebunitVersion = 3.2
+# TODO create CQ for version 2.15?
+htmlUnitVersion = 2.15
+
+# system-tests
+dumbsterVersion = 1.6.0
+
+# optional Spring Framework 4.2.9.RELEASE dependencies
+# only used to generate the correct OSGi manifests
+
+# spring-aop
+jamonVersion = 2.81
+commonsPool2Version = 2.4.2
+
+# spring-aspects
+javaxCacheVersion = 1.0.0
+
+# spring-beans
+groovyVersion = 2.4.5
+snakeYamlVersion = 1.16
+
+# spring-context
+# bundlor fails with 2.0b4
+beanShellVersion = 2
+jodaTimeVersion = 2.9.1
+jrubyVersion = 1.7.23
+
+# spring-context-support
+commonjVersion = 1.1.0
+ehcacheVersion = 2.10.1
+freemarkerVersion = 2.3.23
+jasperreportsVersion = 6.2.0
+velocityVersion = 1.7
+
+# spring-core
+joptSimpleVersion = 4.9
+
+# spring-jdbc
+c3p0Version = 0.9.5.2
+hsqldbVersion = 2.3.3
+jacksonVersion = 2.6.4
+
+# spring-messaging
+nettyVersion = 4.0.33.Final
+reactorVersion = 2.0.7.RELEASE
+
+# spring-orm
+openjpaVersion = 2.4.0
+
+# spring-oxm
+xstreamVersion = 1.4.8
+xmlBeans = 2.6.0
+castorVersion = 1.4.0
+jibxVersion = 1.2.6
+
+# spring-web
+hessianVersion = 4.0.38
+gsonVersion = 2.5
+protobufJavaVersion = 2.6.1
+protobufJavaFormatVersion = 1.2
+romeVersion = 1.5.1
+okhttpVersion = 2.7.0
+
+# CQ 13638
+okhttp3Version = 3.8.0
+# CQ 13639
+okioVersion = 1.13.0
+
+# spring-webmvc
+jxlVersion = 2.6.12
+poiVersion = 3.13
+webjarsVersion = 0.28
+
+# spring-websocket
+undertowVersion = 1.3.10.Final
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..ebf9a52
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..113d8f7
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Jun 07 09:24:50 CEST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..4453cce
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..e95643d
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off

+@rem ##########################################################################

+@rem

+@rem  Gradle startup script for Windows

+@rem

+@rem ##########################################################################

+

+@rem Set local scope for the variables with windows NT shell

+if "%OS%"=="Windows_NT" setlocal

+

+set DIRNAME=%~dp0

+if "%DIRNAME%" == "" set DIRNAME=.

+set APP_BASE_NAME=%~n0

+set APP_HOME=%DIRNAME%

+

+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

+set DEFAULT_JVM_OPTS=

+

+@rem Find java.exe

+if defined JAVA_HOME goto findJavaFromJavaHome

+

+set JAVA_EXE=java.exe

+%JAVA_EXE% -version >NUL 2>&1

+if "%ERRORLEVEL%" == "0" goto init

+

+echo.

+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

+echo.

+echo Please set the JAVA_HOME variable in your environment to match the

+echo location of your Java installation.

+

+goto fail

+

+:findJavaFromJavaHome

+set JAVA_HOME=%JAVA_HOME:"=%

+set JAVA_EXE=%JAVA_HOME%/bin/java.exe

+

+if exist "%JAVA_EXE%" goto init

+

+echo.

+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

+echo.

+echo Please set the JAVA_HOME variable in your environment to match the

+echo location of your Java installation.

+

+goto fail

+

+:init

+@rem Get command-line arguments, handling Windows variants

+

+if not "%OS%" == "Windows_NT" goto win9xME_args

+

+:win9xME_args

+@rem Slurp the command line arguments.

+set CMD_LINE_ARGS=

+set _SKIP=2

+

+:win9xME_args_slurp

+if "x%~1" == "x" goto execute

+

+set CMD_LINE_ARGS=%*

+

+:execute

+@rem Setup the command line

+

+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+

+@rem Execute Gradle

+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

+

+:end

+@rem End local scope for the variables with windows NT shell

+if "%ERRORLEVEL%"=="0" goto mainEnd

+

+:fail

+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

+rem the _cmd.exe /c_ return code!

+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

+exit /b 1

+

+:mainEnd

+if "%OS%"=="Windows_NT" endlocal

+

+:omega

diff --git a/org.eclipse.virgo.site/build.gradle b/org.eclipse.virgo.site/build.gradle
new file mode 100644
index 0000000..f7b7f55
--- /dev/null
+++ b/org.eclipse.virgo.site/build.gradle
@@ -0,0 +1,644 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+import static virgobuild.UpdateSitePlugin.CREATE_P2_REPOSITORY_TASK_NAME
+import static virgobuild.UpdateSitePlugin.PRE_NORMALIZED_BUNDLES_DIR_NAME
+import static virgobuild.VirgoToolsPlugin.installProduct
+import static virgobuild.VirgoToolsPlugin.publishProduct
+
+import virgobuild.Constants
+
+apply plugin: virgobuild.UpdateSitePlugin
+apply plugin: 'org.hidetake.ssh'
+
+buildscript {
+    repositories { jcenter() }
+    dependencies { classpath 'org.hidetake:gradle-ssh-plugin:1.1.2' }
+}
+
+updateSite {
+    extraResources = files('epl-v10.html', 'notice.html', 'p2.index')
+    hook { Project project ->
+        postProcessing(project)
+    }
+    signing { File unsignedFolder, File signedFolder ->
+        if (gradle.taskGraph.hasTask(uploadUpdateSite)) {
+            signByEclipseService(unsignedFolder, signedFolder)
+        } else {
+            signLocally(unsignedFolder, signedFolder)
+        }
+    }
+    mutateArtifactsXml { Node artifactsXml ->
+        addExtraPropertiesToArtifactsXml(artifactsXml)
+    }
+}
+
+remotes {
+    eclipseDotOrg {
+        host = ECLIPSE_ORG_FTP_HOST
+        user =  ECLIPSE_ORG_FTP_USER
+        password = ECLIPSE_ORG_FTP_PASSWORD
+        knownHosts = project.rootProject.file('gradle/ssh/known_hosts')
+    }
+}
+
+dependencies {
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.agent.dm')
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.artifact')
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.deployer')
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.deployer.dm')
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.dmfragment')
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.equinox.extensions')
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.kerneldmfragment')
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.model')
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.osgi')
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.services')
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.userregion')
+    localPlugin project(':kernel:org.eclipse.virgo.kernel.userregionfactory')
+    localPlugin project(':kernel:org.eclipse.virgo.management.console')
+    localPlugin project(':kernel:org.eclipse.virgo.management.fragment')
+    localPlugin project(':kernel:org.eclipse.virgo.shell.command')
+
+    localPlugin project(':medic:org.eclipse.virgo.medic')
+    localPlugin project(':medic:org.eclipse.virgo.medic.core')
+    localPlugin project(':medic:org.eclipse.virgo.medic.logbackclassicfragment')
+    localPlugin project(':medic:org.eclipse.virgo.medic.logbackcorefragment')
+
+    localPlugin project(':nano:org.eclipse.virgo.nano.core')
+    localPlugin project(':nano:org.eclipse.virgo.nano.deployer')
+    localPlugin project(':nano:org.eclipse.virgo.nano.deployer.api')
+    localPlugin project(':nano:org.eclipse.virgo.nano.deployer.hot')
+    localPlugin project(':nano:org.eclipse.virgo.nano.management')
+    localPlugin project(':nano:org.eclipse.virgo.nano.management.controller')
+    localPlugin project(':nano:org.eclipse.virgo.nano.services.concurrent')
+    localPlugin project(':nano:org.eclipse.virgo.nano.services.ds')
+
+    localPlugin project(':repository:org.eclipse.virgo.repository')
+    // TODO - review if all those signedExternalPlugins are signed
+    signedExternalPlugin group: 'org.eclipse.virgo.mirrored', name: 'org.apache.commons.codec', version: commonsCodecVersion, ext: "jar"
+    // optional requirement for org.springframework.core
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.logging", version: commonsLoggingVersion, ext: "jar"
+
+    signedExternalPlugin group: 'org.eclipse.virgo.mirrored', name: 'oevm.org.apache.commons.httpclient', version: commonsHttpClientVersion, ext: "jar"
+
+    localPlugin project(':util:org.eclipse.virgo.util.common')
+    localPlugin project(':util:org.eclipse.virgo.util.env')
+    localPlugin project(':util:org.eclipse.virgo.util.io')
+    localPlugin project(':util:org.eclipse.virgo.util.jmx')
+    localPlugin project(':util:org.eclipse.virgo.util.math')
+    localPlugin project(':util:org.eclipse.virgo.util.osgi')
+    localPlugin project(':util:org.eclipse.virgo.util.osgi.manifest')
+    localPlugin project(':util:org.eclipse.virgo.util.parser.launcher')
+    localPlugin project(':util:org.eclipse.virgo.util.parser.manifest')
+
+    localPlugin project(':web:org.eclipse.virgo.web.core')
+    localPlugin project(':web:org.eclipse.virgo.web.dm')
+    localPlugin project(':web:org.eclipse.virgo.web.tomcat.support')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.appdeployer')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.applistener')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.catalina.fragment.webbeans')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.javax.persistence.extension')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.jsf.support')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.bval')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.jotm')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.jpa')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.webbeans')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.initialiser')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.jpa.integration')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.tomcat.factory')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.openwebbeans.initialiser')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.security')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.security.openejb.classloading.hook')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.security.valve')
+    localPlugin project(':web:org.eclipse.virgo.web.enterprise.services.accessor')
+    localPlugin project(':web:org.eclipse.virgo.web.servlet.adapter')
+    localPlugin project(':web:org.eclipse.virgo.web.spring.integration')
+    localPlugin project(':web:org.eclipse.virgo.web.war.deployer')
+
+    // TODO - review if all those signedExternalPlugins are signed
+    signedExternalPlugin group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
+    // exports package org.apache.commons.logging (jcl - Jakarta Commons Logging)
+    signedExternalPlugin group: "org.slf4j", name: "slf4j-jcl", version: slf4jVersion
+    signedExternalPlugin group: "org.slf4j", name: "slf4j-log4j12", version: slf4jVersion
+    signedExternalPlugin group: "org.slf4j", name: "jul-to-slf4j", version: slf4jVersion
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.aspectj.weaver", version: aspectjVersion, ext: "jar"
+
+    // TODO - rename feature to region'_'
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.equinox.regions')
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.core')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.ds')
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.common", version: equinoxCommonVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.ds", version: equinoxDsVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.event", version: equinoxEventVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.util", version: equinoxUtilVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.cm", version: equinoxCmVersion, configuration: "compile", ext: "jar"
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.kernel')
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.equinox.http.jetty')
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.http.jetty", version: equinoxHttpJettyVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.http.servlet", version: equinoxHttpServletVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.continuation", version: jettyVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.http", version: jettyVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.io", version: jettyVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.security", version: jettyVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.server", version: jettyVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.servlet", version: jettyVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jetty.util", version: jettyVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "runtime", ext: "jar"
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.rap')
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.rap.rwt", version: rapRwtVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.rap.rwt.osgi", version: rapRwtOsgiVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.commands", version: eclipseCoreCommandsVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.rap.jface", version: rapJfaceVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "com.ibm.icu.base", version: icuBaseVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.databinding", version: eclipseCoreDatabindingVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.databinding.property", version: eclipseCoreDatabindingPropertyVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.databinding.observable", version: eclipseCoreDatabindingObservableVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.rap.jface.databinding", version: rapJfaceDatabindingVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.rap.ui", version: rapUiVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "runtime", ext: "jar"
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.kernel.springintegration')
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.expression", version: springframeworkVersion, ext: "jar"
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.management')
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "osgi.enterprise", version: osgiEnterpriseVersion, configuration: "compile", ext: "jar" // contains org.osgi.jmx
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.gemini.management", version: geminiManagementVersion, configuration: "compile", ext: "jar"
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.medic')
+    signedExternalPlugin group: "ch.qos.logback", name: "logback-core", version: logbackVersion
+    signedExternalPlugin group: "ch.qos.logback", name: "logback-classic", version: logbackVersion
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.deployer')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans.controller')
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.shell')
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.console", version: equinoxConsoleVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.console.ssh", version: equinoxConsoleSshVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.mina.core", version: minaCoreVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.sshd.core", version: apacheSshdCoreVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.command", version: gogoCommandVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.runtime", version: gogoRuntimeVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.shell", version: gogoShellVersion, configuration: "compile", ext: "jar"
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.simpleconfigurator')
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.simpleconfigurator", version: equinoxSimpleConfiguratorVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.simpleconfigurator.manipulator", version: equinoxSimpleConfiguratorManipulatorVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.frameworkadmin", version: equinoxFrameworkadminVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.frameworkadmin.equinox", version: equinoxFrameworkadminEquinoxVersion, configuration: "compile", ext: "jar"
+
+    // TODO - rename feature to org.eclipse.gemini.blueprint
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.springdm')
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "oevm.org.aopalliance", version: orgAopAllianceVersion, ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.aop", version: springframeworkVersion, ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.beans", version: springframeworkVersion, ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.context", version: springframeworkVersion, ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.springframework.core", version: springframeworkVersion, ext: "jar"
+    signedExternalPlugin group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-io", version: geminiBlueprintVersion, ext: "jar"
+    signedExternalPlugin group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-core", version: geminiBlueprintVersion, ext: "jar"
+    signedExternalPlugin group: "org.eclipse.gemini.blueprint", name: "gemini-blueprint-extender", version: geminiBlueprintVersion, ext: "jar"
+
+    // nano base
+    // TODO - merge to oev.nano.services ?
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.services.concurrent')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.services.ds')
+
+    // TODO - merge with management features above?
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.webconsole.deps')
+
+    signedExternalPlugin group: "commons-fileupload", name: "commons-fileupload", version: commonsFileuploadVersion, ext: "jar"
+    signedExternalPlugin group: "commons-io", name: "commons-io", version: commonsIoVersion, ext: "jar"
+    signedExternalPlugin group: "org.jolokia", name: "jolokia-osgi", version: jolokiaVersion, ext: "jar"
+
+    // nano full
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.p2.provisioning')
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.contenttype", version: eclipseCoreContenttypeVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.jobs", version: eclipseCoreJobsVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.net", version: eclipseCoreNetVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.core.runtime", version: eclipseCoreRuntimeVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.ecf", version: eclipseEcfVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.ecf.filetransfer", version: eclipseEcfFiletransferVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.ecf.identity", version: eclipseEcfIdentityVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.ecf.provider.filetransfer", version: eclipseEcfProviderFiletransferVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.ecf.ssl", version: eclipseEcfSslVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.app", version: equinoxAppVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.preferences", version: equinoxPreferencesVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.registry", version: equinoxRegistryVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.security", version: equinoxSecurityVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.sat4j.core", version: sat4jCoreVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.sat4j.pb", version: sat4jPbVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.artifact.repository", version: p2ArtifactRepositoryVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.console", version: p2ConsoleVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.core", version: p2CoreVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.director", version: p2DirectorVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.engine", version: p2EngineVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.garbagecollector", version: p2GarbageCollectorVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.jarprocessor", version: p2JarProcessorVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.metadata", version: p2MetadataVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.metadata.repository", version: p2MetadataRepositoryVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.publisher", version: p2PublisherVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.publisher.eclipse", version: p2PublisherEclipseVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.repository", version: p2RepositoryVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.touchpoint.eclipse", version: p2TouchpointEclipseVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.touchpoint.natives", version: p2TouchpointNativesVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.p2.transport.ecf", version: p2TransportEcfVersion, configuration: "compile", ext: "jar"
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.nano.war.deployer')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.enterprise')
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.gemini.web')
+    signedExternalPlugin group: "org.eclipse.gemini", name: "org.eclipse.gemini.web.core", version: geminiWebVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.gemini", name: "org.eclipse.gemini.web.extender", version: geminiWebVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.gemini", name: "org.eclipse.gemini.web.tomcat", version: geminiWebVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.gemini", name: "org.eclipse.gemini.web.jaspic.fragment", version: geminiWebVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.log4j", version: apacheLog4jVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.objectweb.asm", version: objectwebAsmVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javassist", version: javassistVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "scannotation", version: scannotationVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.bval", version: apacheBvalVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.quartz", version: quartzVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.ow2.jotm.jotm-core", version: jotmVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "javax.interceptor", name: "javax.interceptor-api", version: javaxInterceptorVersion
+    signedExternalPlugin group: "javax.transaction", name: "javax.transaction-api", version: javaxTransactionVersion
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.annotation", version: javaxAnnotationVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.ejb", version: javaxEjbVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.inject", version: javaxInjectVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.jms", version: javaxJmsVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.persistence", version: javaxPersistenceVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.resource", version: javaxResourceVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.security.auth.message", version: javaxSecurityAuthMessageVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.security.jacc", version: javaxSecurityJaccVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "javax.servlet.jsp.jstl", name: "javax.servlet.jsp.jstl-api", version: javaxServletJspJstlApiVersion
+    signedExternalPlugin group: "org.glassfish.web", name: "javax.servlet.jsp.jstl", version: javaxServletJspJstlImplVersion
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.validation", version: javaxValidationVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.wsdl", version: javaxWsdlVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.ws.rs", version: javaxWsRsVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.glassfish.javax.faces", version: glassfishJavaxFacesVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.glassfish.com.sun.faces", version: glassfishComSunFacesVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.geronimo.components.connector", version: geronimoComponentsConnectorVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.geronimo.components.transaction", version: geronimoComponentsTransactionVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.geronimo.specs.j2ee.management", version: geronimoSpecsJ2eeManagementVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.geronimo.specs.osgi.locator", version: geronimoSpecsOsgiLocatorVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.geronimo.specs.osgi.registry", version: geronimoSpecsOsgiRegistryVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.beanutils", version: commonsBeanutilsVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "oevm.org.apache.commons.cli", version: commonsCliVersion, ext: "jar"
+    signedExternalPlugin group: "commons-collections", name: "commons-collections", version: commonsCollectionsVersion
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.lang", version: commonsLangVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.dbcp", version: commonsDbcpVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.commons.pool", version: commonsPoolVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "cdi.api", version: cdiApiVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openejb.api", version: apacheOpenejbVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openejb.core", version: apacheOpenejbCoreVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openejb.javaagent", version: apacheOpenejbVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openejb.jee", version: apacheOpenejbVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openejb.loader", version: apacheOpenejbVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openejb.jpa-integration", version: apacheOpenejbVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openwebbeans.ee", version: apacheOpenwebbeansEEVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openwebbeans.ee.common", version: apacheOpenwebbeansVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openwebbeans.ejb", version: apacheOpenwebbeansEEVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openwebbeans.impl", version: apacheOpenwebbeansVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openwebbeans.jsf", version: apacheOpenwebbeansVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openwebbeans.spi", version: apacheOpenwebbeansVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openwebbeans.tomcat7", version: apacheOpenwebbeansTomcat7Version, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.openwebbeans.web", version: apacheOpenwebbeansVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.xbean.asm", version: apacheXBeanAsmVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.xbean.bundleutils", version: apacheXBeanBundleutilsVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.xbean.finder", version: apacheXBeanFinderVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.xbean.naming", version: apacheXBeanNamingVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.xbean.reflect", version: apacheXBeanReflectVersion, configuration: "compile", ext: "jar"
+
+    // Tomcat Runtime
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.el", version: javaxElVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "com.sun.mail", name: "javax.mail", version: javaxMailVersion
+    // TODO - check CQ and put version into properties
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.activation", version: '1.1.0.v201211130549', configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.servlet.jsp", version: javaxServletJspVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.websocket", version: javaxWebsocketVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "javax.xml.rpc", version: javaxXmlRpcVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.catalina", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.catalina.ha", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.catalina.tribes", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.coyote", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.el", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.jasper", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.juli", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.tomcat.api", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.tomcat.util", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.tomcat.jni", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.tomcat.websocket", version: apacheCatalinaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.jdt.core.compiler.batch", version: eclipseJdtCoreCompilerBatchVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.antlr", version: eclipsePersistenceAntlrVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.asm", version: eclipsePersistenceAsmVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.core", version: eclipsePersistenceCoreVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.jpa", version: eclipsePersistenceJpaVersion, configuration: "compile", ext: "jar"
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.eclipse.persistence.jpa.jpql", version: eclipsePersistenceJpaJpqlVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin group: "org.eclipse.virgo.mirrored", name: "org.apache.derby", version: apacheDerbyVersion, configuration: "compile", ext: "jar"
+
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.appdeployer')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.applistener')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.catalina.fragment.webbeans')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.javax.persistence.extension')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.jsf.support')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.bval')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.jotm')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.jpa')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.fragment.webbeans')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.initialiser')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.openejb.tomcat.factory')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.openwebbeans.initialiser')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.security')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.security.openejb.classloading.hook')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.security.valve')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.enterprise.services.accessor')
+    signedExternalPlugin project(':web:org.eclipse.virgo.web.war.deployer')
+
+    localFeature project(':org.eclipse.virgo.site:org.eclipse.virgo.tools')
+}
+
+task zipUpdateSite(type: Zip, dependsOn : createP2Repository) {
+    from "${buildDir}/repository"
+    baseName 'repository'
+}
+
+task uploadUpdateSite(dependsOn : createP2Repository) {
+    description = "Uploads the generated update site to the eclipse.org server."
+
+    doLast {
+        // folder structure
+        // releases                    (main folder - composite update site if release repository)
+        //  |--1.0                     (version folder - always a composite update site)
+        //     |--1.0.0.v20150413-1512 (repository folder - simple update site)
+
+        // define the folder structure
+        def releaseTypeFolder = "${ECLIPSE_ORG_FTP_UPDATE_SITES_PATH}/${releaseTypeFolder(project)}"
+        def versionFolder = "${releaseTypeFolder}/${releaseVersion()}"
+        def repositoryFolder = "${versionFolder}/${project.version}"
+
+        // create composite update site for the root of the release repository and for the versions folder
+        def config = eclipsebuild.BuildshipConfig.on(project)
+        def compositeFolders = config.isRelease() ? [
+            releaseTypeFolder,
+            versionFolder
+        ]: [versionFolder]
+
+        // upload the update site and update the composite descriptors
+        ssh.run {
+            session(remotes.eclipseDotOrg) {
+                // create the leaf directory if not exist
+                execute "mkdir -p $repositoryFolder"
+
+                // copy the update site from the build directory to the remote location
+                put from: files { file("$buildDir/repository").listFiles() }, into: repositoryFolder
+
+                // recreate the compositeArtifacts.jar and the compositeContent.jar files
+                compositeFolders.each { execute("""cd ${it}
+                      ${file('updateCompositeUpdateSite.sh').text}""") }
+            }
+        }
+    }
+}
+
+// utility methods
+def releaseTypeFolder(Project project) {
+    def config = eclipsebuild.BuildshipConfig.on(project)
+    if(config.isRelease()) {
+        "releases"
+    } else if(config.isMilestone()){
+        "milestones"
+    } else if(config.isSnapshot()) {
+        "snapshots"
+    } else {
+        throw new IllegalStateException("BuildshipConfig must either be a release, milestone, or snapshot.")
+    }
+}
+
+def releaseVersion() {
+    // crop the major.minor segment from the version number
+    def matcher = version =~ /(\d+\.\d+)\.\d+\..*/
+    matcher[0][1]
+}
+
+private void postProcessing(project) {
+}
+
+private void signByEclipseService(unsignedFolder, signedFolder) {
+    ssh.run {
+        session(remotes.eclipseDotOrg) {
+            // the remote folder where the jars are signed
+            def remoteFolder = "${ECLIPSE_ORG_TEMP_PATH}/${signedFolder.name}"
+
+            // clean up the folder used for signing if the previous build failed
+            execute """rm -rf $remoteFolder
+                    mkdir -p $remoteFolder"""
+
+            // transfer the unsigned files to the remote host
+            put from: file(unsignedFolder).listFiles() as List, into: remoteFolder
+
+            // perform the signing
+            execute """ cd $remoteFolder
+                    # iterate all jars in the subfolders
+                    for jar in \$(find `pwd` -name '*.jar');
+                    do
+                        # save the signed jar into a temporary file copy and write it's content to the unsigned jar
+                        curl -o signed.jar -F filedata=@\$jar http://build.eclipse.org:31338/sign
+                        cp signed.jar \$jar
+                        rm signed.jar
+                    done
+                    """
+
+            // retrieve the signed content from the remote host into the build/signed-bundles folder
+            get from: remoteFolder, into: signedFolder.parentFile
+
+            // clean up the remote folder
+            execute "rm -rf $remoteFolder"
+        }
+    }
+}
+
+private void signLocally(File unsignedFolder, File signedFolder) {
+    def unsignedPluginsDir = new File(unsignedFolder, "plugins")
+    def unsignedFeaturesDir = new File(unsignedFolder, "features")
+    def signedPluginsDir = new File(signedFolder, "plugins")
+    def signedFeaturesDir = new File(signedFolder, "features")
+
+    signedPluginsDir.mkdirs()
+    signedFeaturesDir.mkdirs()
+
+    if (System.properties['skip.local.signing'] == 'true') {
+        project.logger.warn("Skipping local signing process!")
+        project.copy { from unsignedPluginsDir into signedPluginsDir }
+        project.copy { from unsignedFeaturesDir into signedFeaturesDir }
+    }
+
+    // TODO - add assert "keystore exists" - otherwise print this help!
+    // How to generate you own Java Key Store for local signing:
+    // $ keytool -genkey -alias virgo -keystore virgo.jks -storepass changeme -keypass development -dname "cn=Florian Waibel, ou=Virgo, o=EclipseSource, c=DE" -validity 365
+    // Verify the keystore on the command line:
+    // $ jarsigner -keystore virgo.jks -storepass changeme -keypass development org.eclipse.virgo.util.env-3.7.0.M2.jar virgo
+    // $ jarsigner -verify -verbose -certs org.eclipse.virgo.util.env-3.7.0.M2.jar
+    File targetDir = signedPluginsDir
+    def signBundle = {
+        if (System.properties['skip.local.signing'] != 'true') {
+            project.logger.info("Sign '${it.absolutePath}'")
+            project.ant.signjar(
+                    verbose: 'true',
+                    destDir: targetDir,
+                    alias: 'virgo',
+                    jar: it,
+                    keystore: project.findProject(':').file('config/signing/virgo.jks'),
+                    storepass: 'changeme',
+                    keypass: 'development',
+                    sigalg: 'SHA1withDSA',
+                    digestalg: 'SHA1',
+                    preservelastmodified: 'true')
+        }
+    }
+
+    unsignedPluginsDir.listFiles().each signBundle
+    targetDir = signedFeaturesDir
+    unsignedFeaturesDir.listFiles().each signBundle
+}
+
+private void addExtraPropertiesToArtifactsXml(Node artifactsXml) {
+    // modify the artifacts.xml file only when it is deployed to the eclipse.org servers
+    if (ECLIPSE_ORG_MIRROR_PATH) {
+        // add p2.mirrorsUrl to the properties section
+        // https://wiki.eclipse.org/Equinox/p2/p2.mirrorsURL
+        def mainPropertiesNode = artifactsXml.depthFirst().find { it.parent()?.name() == 'repository' && it.name() == 'properties' }
+        new Node(mainPropertiesNode, 'property', ['name': 'p2.mirrorsURL', 'value': calculateP2MirrorsUrl(project)] )
+
+        // add download.stats property to each installable unit
+        // https://wiki.eclipse.org/Equinox_p2_download_stats#Enabling_stats_in_your_repository
+        new Node(mainPropertiesNode, 'property', ['name': 'p2.statsURI', 'value': calculateStatsUri(project)])
+        mainPropertiesNode.@size = mainPropertiesNode.children().size()
+
+        // add <property name="download.stats" value="feature-id"/> node to the features
+        artifactsXml.depthFirst().findAll {
+            it.parent()?.parent()?.name() == 'artifacts' &&
+                    it.parent()?.name() == 'artifact' &&
+                    it.parent()?.@classifier == 'org.eclipse.update.feature' &&
+                    it.name() == 'properties'
+        }.each {
+            new Node(it, 'property', ['name': 'download.stats', 'value': it.parent().@id ] )
+            it.@size = it.children().size()
+        }
+    }
+}
+
+def calculateP2MirrorsUrl(Project project) {
+    def repositoryPath = "${ECLIPSE_ORG_MIRROR_PATH}/${releaseTypeFolder(project)}/${releaseVersion()}/${project.version}"
+    "http://www.eclipse.org/downloads/download.php?file=${repositoryPath}&format=xml"
+}
+
+def calculateStatsUri(Project project) {
+    "http://download.eclipse.org/stats/virgo/${releaseTypeFolder(project)}/${releaseVersion()}"
+}
+
+// TODO - think about a way to trigger :org.eclipse.virgo.site:publishBase and :org.eclipse.virgo.site:publishKernelBase after site creation
+project.tasks.addRule("Pattern: publish<ID>") { String taskName ->
+    if (taskName.startsWith("publish")) {
+        project.task (taskName, dependsOn: [
+            ":org.eclipse.virgo.site:${CREATE_P2_REPOSITORY_TASK_NAME}",
+        ]) {
+            def product = 'undefined'
+            switch (taskName.toString() - 'publish') {
+                case 'Base': product = 'base'; break
+                case 'KernelBase': product = 'kernel-base'; break
+                case 'NanoCore': product = 'nano-core'; break
+                case 'NanoBase': product = 'nano-base'; break
+                case 'Nano': product = 'nano'; break
+                case 'NanoFull': product = 'nano-full'; break
+            }
+            group = Constants.gradleTaskGroupName
+            description = "Publishes a product to a p2 repository. The publishing uses ANY environment configurations."
+
+            // TODO rework to something like createP2repository.outputs.repository?
+            // File repositoryDir = file(project.rootProject.tasks[":org.eclipse.virgo.site:${CREATE_P2_REPOSITORY_TASK_NAME}"].buildDir + "/repository/")
+            File repositoryDir = project.file("${project.rootProject.projectDir}/org.eclipse.virgo.site/build/repository/")
+            File productFileLocation = project.file("${project.projectDir}/publish_resources/products/${product}/${product}.product")
+            File javaProfileLocation = project.file("${project.projectDir}/src/main/dist/configuration/java-server.profile")
+
+            inputs.dir repositoryDir
+            inputs.file productFileLocation
+            inputs.file javaProfileLocation
+
+            doLast { publishProduct(project, repositoryDir, productFileLocation, javaProfileLocation) }
+        }
+    }
+}
+
+// for testing purposes only
+task ('installProductNanoBase', dependsOn: [
+    'publishNanoCore',
+    'publishNanoBase'
+]) {
+
+    description = "Installs a Virgo product to a desired destination. Default profile(roaming) is VIRGOProfile, the environment cofigurations are ANY."
+
+    def product = 'nano-base'
+    def shortProduct = 'VNB'
+    def destinationDir = file("${buildDir}/${shortProduct}/${product}")
+    def productIu = "${product}.product"
+
+    doLast() { installProduct(project, productIu, destinationDir) }
+}
+
+// for testing purposes only
+task ('installProductNano', dependsOn: [
+    'publishNanoCore',
+    'publishNanoBase',
+    'publishNano',
+]) {
+
+    description = "Installs a Virgo product to a desired destination. Default profile(roaming) is VIRGOProfile, the environment cofigurations are ANY."
+
+    def product = 'nano'
+    def shortProduct = 'VN'
+    def destinationDir = file("${buildDir}/${shortProduct}/${product}")
+    def productIu = "${product}.product"
+
+    doLast() { installProduct(project, productIu, destinationDir) }
+}
+
+// for testing purposes only
+task ('installProductNanoFull', dependsOn: [
+    'publishNanoCore',
+    'publishNanoBase',
+    'publishNano',
+    'publishNanoFull',
+]) {
+
+    description = "Installs a Virgo product to a desired destination. Default profile(roaming) is VIRGOProfile, the environment cofigurations are ANY."
+
+    def product = 'nano-full'
+    def shortProduct = 'VNF'
+    def destinationDir = file("${buildDir}/${shortProduct}/${product}")
+    def productIu = "${product}.product"
+
+    doLast() { installProduct(project, productIu, destinationDir) }
+}
diff --git a/org.eclipse.virgo.site/category.xml b/org.eclipse.virgo.site/category.xml
new file mode 100644
index 0000000..866ea52
--- /dev/null
+++ b/org.eclipse.virgo.site/category.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site pack200="true">
+    <!-- TODO add 2nd category 3rd party libraries? -->
+    <category-def name="virgo" label="Virgo from EclipseRT">
+    	<description>
+    		A module-based Java application server.  
+    	</description>
+    </category-def>
+    <!-- TODO rename to org.eclipse.equinox.region -->
+    <feature id="org.eclipse.equinox.regions"
+        url="features/org.eclipse.equinox.regions_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+    <feature id="org.eclipse.virgo.core"
+        url="features/org.eclipse.virgo.core_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+    <!-- TODO rename to org.eclipse.equinox.ds -->
+    <feature id="org.eclipse.virgo.ds"
+        url="features/org.eclipse.virgo.ds_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+    <feature id="org.eclipse.virgo.kernel"
+        url="features/org.eclipse.virgo.kernel_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+    <feature id="org.eclipse.equinox.http.jetty"
+        url="features/org.eclipse.equinox.http.jetty_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+    <!-- TODO rename to gemini.blueprint -->
+    <feature id="org.eclipse.virgo.kernel.springintegration"
+        url="features/org.eclipse.virgo.kernel.springintegration_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+    <feature id="org.eclipse.virgo.management"
+        url="features/org.eclipse.virgo.management_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+    <feature id="org.eclipse.virgo.medic"
+        url="features/org.eclipse.virgo.medic_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+    <feature id="org.eclipse.virgo.nano.mbeans"
+        url="features/org.eclipse.virgo.nano.mbeans_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+    <feature id="org.eclipse.virgo.shell"
+        url="features/org.eclipse.virgo.shell_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+    <feature id="org.eclipse.virgo.simpleconfigurator"
+        url="features/org.eclipse.virgo.simpleconfigurator_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+    <!-- TODO rename to org.eclipse.gemini.blueprint -->
+    <feature id="org.eclipse.virgo.springdm"
+        url="features/org.eclipse.virgo.springdm_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+
+    <feature id="org.eclipse.virgo.tools"
+        url="features/org.eclipse.virgo.tools_0.0.0.jar"
+        version="0.0.0">
+        <category name="virgo" />
+    </feature>
+</site>
diff --git a/org.eclipse.virgo.site/epl-v10.html b/org.eclipse.virgo.site/epl-v10.html
new file mode 100644
index 0000000..fd39122
--- /dev/null
+++ b/org.eclipse.virgo.site/epl-v10.html
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
diff --git a/org.eclipse.virgo.site/gradle.properties b/org.eclipse.virgo.site/gradle.properties
new file mode 100644
index 0000000..b3cfac7
--- /dev/null
+++ b/org.eclipse.virgo.site/gradle.properties
@@ -0,0 +1,17 @@
+# sftp server url
+ECLIPSE_ORG_FTP_HOST=
+
+# sftp username
+ECLIPSE_ORG_FTP_USER=
+
+# sftp password
+ECLIPSE_ORG_FTP_PASSWORD=
+
+# sftp absolute path to the root of the updates-sites
+ECLIPSE_ORG_FTP_UPDATE_SITES_PATH=
+
+# relative path to the root of the temp folder used for signing the jars remotely
+ECLIPSE_ORG_TEMP_PATH=
+
+# relative path to the root of the update-sites mirror
+ECLIPSE_ORG_MIRROR_PATH=
diff --git a/org.eclipse.virgo.site/notice.html b/org.eclipse.virgo.site/notice.html
new file mode 100644
index 0000000..c3d34c3
--- /dev/null
+++ b/org.eclipse.virgo.site/notice.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/build.gradle b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/build.properties b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/build.properties
new file mode 100644
index 0000000..a13e18b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg,\
+               p2.inf
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/feature.properties b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/feature.properties
new file mode 100644
index 0000000..f5e4797
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Equinox HTTP Service Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the Equinox HTTP Service bundle.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/feature.xml b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/feature.xml
new file mode 100755
index 0000000..d921df3
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/feature.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.equinox.http.jetty"
+      label="%featureName"
+      version="@EQUINOX.HTTP.JETTY.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.equinox.http.jetty"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.HTTP.JETTY.VERSION@"
+         unpack="false"/>
+
+	     <plugin
+	           id="org.eclipse.jetty.continuation"
+	           download-size="0"
+	           install-size="0"
+	           version="@JETTY.VERSION@"
+	           unpack="false"/>
+
+	     <plugin
+	           id="org.eclipse.jetty.http"
+	           download-size="0"
+	           install-size="0"
+	           version="@JETTY.VERSION@"
+	           unpack="false"/>
+
+	     <plugin
+	           id="org.eclipse.jetty.io"
+	           download-size="0"
+	           install-size="0"
+	           version="@JETTY.VERSION@"
+	           unpack="false"/>
+
+	     <plugin
+	           id="org.eclipse.jetty.security"
+	           download-size="0"
+	           install-size="0"
+	           version="@JETTY.VERSION@"
+	           unpack="false"/>
+
+	     <plugin
+	           id="org.eclipse.jetty.server"
+	           download-size="0"
+	           install-size="0"
+	           version="@JETTY.VERSION@"
+	           unpack="false"/>
+
+	     <plugin
+	           id="org.eclipse.jetty.servlet"
+	           download-size="0"
+	           install-size="0"
+	           version="@JETTY.VERSION@"
+	           unpack="false"/>
+
+	     <plugin
+	           id="org.eclipse.jetty.util"
+	           download-size="0"
+	           install-size="0"
+	           version="@JETTY.VERSION@"
+	           unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/license.html b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.http.jetty/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/build.gradle b/org.eclipse.virgo.site/org.eclipse.equinox.regions/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.regions/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/build.properties b/org.eclipse.virgo.site/org.eclipse.equinox.regions/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.regions/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.equinox.regions/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.regions/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.equinox.regions/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.regions/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/feature.properties b/org.eclipse.virgo.site/org.eclipse.equinox.regions/feature.properties
new file mode 100644
index 0000000..460662e
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.regions/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Regions Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides region support in Virgo Kernel.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/org.eclipse.virgo.site/org.eclipse.equinox.regions/feature.xml b/org.eclipse.virgo.site/org.eclipse.equinox.regions/feature.xml
new file mode 100755
index 0000000..e23caf6
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.equinox.regions/feature.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.equinox.regions"
+      label="%featureName"
+      version="@REGION.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.equinox.region"
+         download-size="0"
+         install-size="0"
+         version="@REGION.VERSION@"
+         unpack="false"
+         autostart="true"/>         
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/build.gradle b/org.eclipse.virgo.site/org.eclipse.gemini.web/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.gemini.web/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/build.properties b/org.eclipse.virgo.site/org.eclipse.gemini.web/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.gemini.web/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.gemini.web/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.gemini.web/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.gemini.web/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.gemini.web/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/feature.properties b/org.eclipse.virgo.site/org.eclipse.gemini.web/feature.properties
new file mode 100644
index 0000000..1b652a6
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.gemini.web/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Gemini Web Container Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This is a minimal feature of Gemini Web for Virgo.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/feature.xml b/org.eclipse.virgo.site/org.eclipse.gemini.web/feature.xml
new file mode 100755
index 0000000..300f3ae
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.gemini.web/feature.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.gemini.web"
+      label="%featureName"
+      version="@GEMINI.WEB.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.gemini.web.tomcat"
+         download-size="0"
+         install-size="0"
+         version="@GEMINI.WEB.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.gemini.web.extender"
+         download-size="0"
+         install-size="0"
+         version="@GEMINI.WEB.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.gemini.web.core"
+         download-size="0"
+         install-size="0"
+         version="@GEMINI.WEB.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.gemini.web.jaspic.fragment"
+         download-size="0"
+         install-size="0"
+         version="@GEMINI.WEB.VERSION@"
+         unpack="false"/>
+    
+    <plugin
+        id="org.apache.jasper"
+        download-size="0"
+        install-size="0"
+        version="@CATALINA.VERSION@"
+        unpack="false"/>
+    
+    <plugin
+        id="org.apache.catalina.ha"
+        download-size="0"
+        install-size="0"
+        version="@CATALINA.VERSION@"
+        unpack="false"/>
+    
+    <plugin
+        id="org.apache.catalina.tribes"
+        download-size="0"
+        install-size="0"
+        version="@CATALINA.VERSION@"
+        unpack="false"/>
+    
+    <plugin
+        id="org.apache.tomcat.jni"
+        download-size="0"
+        install-size="0"
+        version="@CATALINA.VERSION@"
+        unpack="false"/>
+    
+    <plugin
+        id="javax.websocket"
+        download-size="0"
+        install-size="0"
+        version="@JAVAX.WEBSOCKET@"
+        unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.gemini.web/license.html b/org.eclipse.virgo.site/org.eclipse.gemini.web/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.gemini.web/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.RSA b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.RSA
new file mode 100755
index 0000000..ddb5866
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.RSA
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.SF b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.SF
new file mode 100755
index 0000000..488a09a
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/ECLIPSE_.SF
@@ -0,0 +1,27 @@
+Signature-Version: 1.0
+SHA1-Digest-Manifest: NlvNW+IFdOxPX0MLSELjWJj64OY=
+Created-By: 1.6.0 (IBM Corporation)
+SHA1-Digest-Manifest-Main-Attributes: ITZ414UJvchvI155VLrDHd0wXW0=
+
+Name: epl-v10.html
+SHA1-Digest: 5M5yOPanU8Bh0NNt4hucpomfnos=
+
+Name: META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.prope
+ rties
+SHA1-Digest: XDRL1tpjtbc0U+yqGpGLBi7Mf5U=
+
+Name: p2.inf
+SHA1-Digest: jAH9XhnRBXKzC16znblEaBFv1xI=
+
+Name: META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.xml
+SHA1-Digest: uAw8vyh/XWOKERX5WwTo9ZnoxLw=
+
+Name: license.html
+SHA1-Digest: leexLIIUuWA4wkAPsn1Q3CxJw/0=
+
+Name: feature.properties
+SHA1-Digest: +QqioQiSPCYao6tvRN4Pz1La7yo=
+
+Name: feature.xml
+SHA1-Digest: 93mEAHMH6F3xvQpECKwSrs4FMVg=
+
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/MANIFEST.MF b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/MANIFEST.MF
new file mode 100755
index 0000000..fe53df8
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/MANIFEST.MF
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Build-Jdk: 1.6.0_45
+Built-By: genie.rt.rap
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven
+
+Name: epl-v10.html
+SHA1-Digest: NWZsVPJAYSVwfmPtqxLykU2FynY=
+
+Name: META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.prope
+ rties
+SHA1-Digest: F8wm9360y8wEsjC325GUrUEFA5U=
+
+Name: p2.inf
+SHA1-Digest: 8jNlA+t4uBa/ntDwzpl09daVYcA=
+
+Name: META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.xml
+SHA1-Digest: n0UEh5h6S0kW/Eev3Eb+DOeMpG8=
+
+Name: license.html
+SHA1-Digest: Z5WKoRSIDCgQNswUpOU/oSPE2a0=
+
+Name: feature.properties
+SHA1-Digest: JCUqinpGTwQuT94B6PNLFK0iE6s=
+
+Name: feature.xml
+SHA1-Digest: 9/Hc/lXeIU53a9klFaWKRFro2OU=
+
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.properties b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.properties
new file mode 100755
index 0000000..72509ad
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Feb 10 13:07:33 EST 2015
+version=2.3.2-SNAPSHOT
+groupId=org.eclipse.rap
+artifactId=org.eclipse.rap.feature
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.xml b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.xml
new file mode 100755
index 0000000..87cf0e4
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/META-INF/maven/org.eclipse.rap/org.eclipse.rap.feature/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2011, 2015 EclipseSource and others
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/legal/epl-v10.html
+
+  Contributors:
+     EclipseSource - initial implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.rap</groupId>
+    <artifactId>org.eclipse.rap.runtime-parent</artifactId>
+    <version>2.3.2-SNAPSHOT</version>
+    <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
+  </parent>
+
+  <artifactId>org.eclipse.rap.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/build.gradle b/org.eclipse.virgo.site/org.eclipse.rap/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/build.properties b/org.eclipse.virgo.site/org.eclipse.rap/build.properties
new file mode 100644
index 0000000..a13e18b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg,\
+               p2.inf
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.rap/epl-v10.html
new file mode 100755
index 0000000..3998fce
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/epl-v10.html
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/feature.properties b/org.eclipse.virgo.site/org.eclipse.rap/feature.properties
new file mode 100755
index 0000000..2779a2d
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/feature.properties
@@ -0,0 +1,158 @@
+################################################################################
+# Copyright (c) 2007, 2015 Innoopract Informationssysteme GmbH and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Innoopract Informationssysteme GmbH - initial API and implementation
+#    EclipseSource - ongoing development
+################################################################################
+
+description = \
+Contains the RAP Runtime bundles.\n\
+Include it in your target platform to develop RAP applications.\n\
+*** DO NOT INSTALL IN YOUR IDE ***
+
+copyright = \
+Copyright (c) 2007, 2015 Innoopract Informationssysteme GmbH and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+   Innoopract Informationssysteme GmbH - initial API and implementation\n\
+   EclipseSource - ongoing development
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 9, 2014\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+\t- Content may be structured and packaged into modules to facilitate delivering,\n\
+\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+\t  plug-in fragments ("Fragments"), and features ("Features").\n\
+\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+\t  in a directory named "plugins".\n\
+\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
+\t  named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+\t- The top-level (root) directory\n\
+\t- Plug-in and Fragment directories\n\
+\t- Inside Plug-ins and Fragments packaged as JARs\n\
+\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
+\t- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+\t   extending or updating the functionality of an Eclipse-based product.\n\
+\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
+\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
+\t   of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/feature.xml b/org.eclipse.virgo.site/org.eclipse.rap/feature.xml
new file mode 100755
index 0000000..e98b944
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/feature.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.rap"
+      label="Virgo RAP Server components"
+      version="2.3.2.20150128-1013"
+      provider-name="Eclipse.org - Virgo RAP Server components">
+
+   <description url="http://www.eclipse.org/rap/">
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="RAP 2.3 Repository" url="http://download.eclipse.org/rt/rap/2.3/"/>
+   </url>
+
+   <plugin
+         id="org.eclipse.rap.rwt"
+         download-size="2813"
+         install-size="7126"
+         version="2.3.2.20150128-1013"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rap.rwt.osgi"
+         download-size="35"
+         install-size="78"
+         version="2.3.2.20150119-1706"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rap.jface"
+         download-size="994"
+         install-size="1978"
+         version="2.3.2.20150119-1706"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rap.jface.databinding"
+         download-size="266"
+         install-size="535"
+         version="2.3.2.20150119-1706"
+         unpack="false"/>
+
+ <!--
+   <plugin
+         id="org.eclipse.rap.ui"
+         download-size="155"
+         install-size="274"
+         version="2.3.2.20150119-1706"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rap.ui.forms"
+         download-size="285"
+         install-size="575"
+         version="2.3.2.20150119-1706"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rap.ui.views"
+         download-size="76"
+         install-size="142"
+         version="2.3.2.20150119-1706"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rap.ui.workbench"
+         download-size="3473"
+         install-size="7209"
+         version="2.3.2.20150119-1706"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rap.ui.cheatsheets"
+         download-size="310"
+         install-size="634"
+         version="2.3.2.20150119-1706"
+         unpack="false"/>
+-->
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/license.html b/org.eclipse.virgo.site/org.eclipse.rap/license.html
new file mode 100755
index 0000000..c3d34c3
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/license.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>April 9, 2014</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.rap/p2.inf b/org.eclipse.virgo.site/org.eclipse.rap/p2.inf
new file mode 100755
index 0000000..e57a5b9
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.rap/p2.inf
@@ -0,0 +1,41 @@
+# Prevent installation if other IUs are already installed with a negative requirement.
+
+requires.0.name = org.eclipse.jface
+requires.0.namespace = org.eclipse.equinox.p2.iu
+requires.0.min = 0
+requires.0.max = 0
+
+requires.1.name = org.eclipse.jface.databinding
+requires.1.namespace = org.eclipse.equinox.p2.iu
+requires.1.min = 0
+requires.1.max = 0
+
+requires.2.name = org.eclipse.swt
+requires.2.namespace = org.eclipse.equinox.p2.iu
+requires.2.min = 0
+requires.2.max = 0
+
+requires.3.name = org.eclipse.ui
+requires.3.namespace = org.eclipse.equinox.p2.iu
+requires.3.min = 0
+requires.3.max = 0
+
+requires.4.name = org.eclipse.ui.cheatsheets
+requires.4.namespace = org.eclipse.equinox.p2.iu
+requires.4.min = 0
+requires.4.max = 0
+
+requires.5.name = org.eclipse.ui.forms
+requires.5.namespace = org.eclipse.equinox.p2.iu
+requires.5.min = 0
+requires.5.max = 0
+
+requires.6.name = org.eclipse.ui.views
+requires.6.namespace = org.eclipse.equinox.p2.iu
+requires.6.min = 0
+requires.6.max = 0
+
+requires.7.name = org.eclipse.ui.workbench
+requires.7.namespace = org.eclipse.equinox.p2.iu
+requires.7.min = 0
+requires.7.max = 0
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.core/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.core/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.core/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.core/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.core/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.core/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.core/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.core/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.core/feature.properties
new file mode 100644
index 0000000..3e16034
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.core/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Core Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the Core features of a Eclipse Virgo OSGi container such as enhanced supportability and deployment mechanisms.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.core/feature.xml
new file mode 100755
index 0000000..b53f5b1
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.core/feature.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.core"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.virgo.ds" version="0.0.0"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.virgo.nano.core"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"
+         autostart="true"/>
+    <plugin
+         id="org.eclipse.virgo.nano.deployer.api"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"/>
+    <plugin
+         id="org.eclipse.virgo.nano.deployer.hot"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.core/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.core/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.core/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.ds/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.ds/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.ds/build.properties
new file mode 100644
index 0000000..a13e18b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.ds/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg,\
+               p2.inf
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.ds/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.ds/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.ds/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.ds/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.ds/feature.properties
new file mode 100644
index 0000000..899db35
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.ds/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Equinox Declarative Services Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the Equinox Declarative Services feature.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.ds/feature.xml
new file mode 100755
index 0000000..19c643f
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.ds/feature.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.ds"
+      label="%featureName"
+      version="@EQUINOX.DS.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.equinox.ds"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.DS.VERSION@"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.ds/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.ds/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.ds/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/build.properties
new file mode 100644
index 0000000..a13e18b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg,\
+               p2.inf
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/feature.properties
new file mode 100644
index 0000000..99c78c0
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Web Enterprise Integration
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the enterprise Virgo Web features.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/feature.xml
new file mode 100755
index 0000000..a0d1834
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/feature.xml
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.enterprise/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.properties
new file mode 100644
index 0000000..7dc7197
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Kernel Spring Integration Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides two spring bundles essential for the complete integration with Spring Framework that are otherwise optionally required.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.xml
new file mode 100755
index 0000000..e206df0
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel.springintegration/feature.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.kernel.springintegration"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+    <plugin
+         id="org.springframework.expression"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>        
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.properties
new file mode 100644
index 0000000..42761e8
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Kernel Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the Kernel features of a Eclipse Virgo OSGi container such as deployment and repository mechanisms. Region support is enabled by this feature.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.xml
new file mode 100755
index 0000000..99e893b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.kernel/feature.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+	id="org.eclipse.virgo.kernel"
+	label="%featureName"
+	version="@VIRGO.VERSION@"
+	provider-name="%providerName"
+	image="eclipse_update_120.jpg">
+
+	<description url="http://www.eclipse.org/virgo/">
+		%description
+	</description>
+
+	<copyright url="http://www.eclipse.org/virgo/">
+		%copyright
+	</copyright>
+
+	<license url="%licenseURL">
+		%license
+	</license>
+
+	<requires>
+		<import feature="org.eclipse.virgo.core" version="0.0.0"/>
+		<import feature="org.eclipse.equinox.regions" version="0.0.0"/>
+	</requires>
+
+   <plugin
+		id="org.eclipse.virgo.kernel.deployer"
+		download-size="0"
+		install-size="0"
+		version="@VIRGO.VERSION@"
+		unpack="false"
+		autostart="true"/>
+   <plugin
+		id="org.eclipse.virgo.kernel.equinox.extensions"
+		download-size="0"
+		install-size="0"
+		version="@VIRGO.VERSION@"
+		unpack="false"
+		autostart="false"/>
+	<plugin
+		id="org.eclipse.virgo.repository"
+		download-size="0"
+		install-size="0"
+		version="@VIRGO.VERSION@"
+		unpack="false"
+		autostart="true"/>
+	<plugin
+		id="org.eclipse.virgo.kernel.agent.dm"
+		download-size="0"
+		install-size="0"
+		version="@VIRGO.VERSION@"
+		unpack="false"
+		autostart="true"/>
+	<plugin
+		id="org.eclipse.virgo.kernel.artifact"
+		download-size="0"
+		install-size="0"
+		version="@VIRGO.VERSION@"
+		unpack="false"
+		autostart="true"/>
+	<plugin
+		id="org.eclipse.virgo.kernel.services"
+		download-size="0"
+		install-size="0"
+		version="@VIRGO.VERSION@"
+		unpack="false"
+		autostart="true"/>
+	<plugin
+		id="org.eclipse.virgo.kernel.model"
+		download-size="0"
+		install-size="0"
+		version="@VIRGO.VERSION@"
+		unpack="false"
+		autostart="true"/>
+	<plugin
+		id="org.eclipse.virgo.kernel.osgi"
+		download-size="0"
+		install-size="0"
+		version="@VIRGO.VERSION@"
+		unpack="false"
+		autostart="true"/>
+	<plugin
+		id="org.eclipse.virgo.kernel.userregionfactory"
+		download-size="0"
+		install-size="0"
+		version="@VIRGO.VERSION@"
+		unpack="false"
+		autostart="true"/>
+	<plugin
+		id="org.eclipse.virgo.kernel.kerneldmfragment"
+		download-size="0"
+		install-size="0"
+		version="@VIRGO.VERSION@"
+		unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.management/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.management/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.management/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.management/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.management/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.management/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.management/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.management/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.management/feature.properties
new file mode 100644
index 0000000..61c85d2
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.management/feature.properties
@@ -0,0 +1,189 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Management Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides OSGi JMX support for Virgo.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+April 14, 2010\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,\n\
+INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS\n\
+(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS\n\
+AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF\n\
+LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.\n\
+BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS\n\
+GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY\n\
+NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+- Content may be structured and packaged into modules to facilitate delivering,\n\
+extending, and upgrading the Content. Typical modules may include plug-ins\n\
+("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").\n\
+- Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+(Java tm ARchive) in a directory named "plugins".\n\
+- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated\n\
+material. Each Feature may be packaged as a sub-directory in a directory named\n\
+"features". Within a Feature, files named "feature.xml" may contain a list\n\
+of the names and version numbers of the Plug-ins and/or Fragments associated\n\
+with that Feature.\n\
+- Features may also include other Features ("Included Features").\n\
+Within a Feature, files named "feature.xml" may contain a list of the\n\
+names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+- The top-level (root) directory\n\
+- Plug-in and Fragment directories\n\
+- Inside Plug-ins and Fragments packaged as JARs\n\
+- Sub-directories of the directory named "src" of certain Plug-ins\n\
+- Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed\n\
+using the Provisioning Technology (as defined below), you must agree to a\n\
+license ("Feature Update License") during the installation process.\n\
+If the Feature contains\n\
+Included Features, the Feature Update License should either provide\n\
+you with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms\n\
+and conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+- Common Public License Version 1.0 (available at\n\
+http://www.eclipse.org/legal/cpl-v10.html)\n\
+- Apache Software License 1.1 (available at\n\
+http://www.apache.org/licenses/LICENSE)\n\
+- Apache Software License 2.0 (available at\n\
+http://www.apache.org/licenses/LICENSE-2.0)\n\
+- Metro Link Public License 1.00 (available at\n\
+http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+- Mozilla Public License Version 1.1 (available at\n\
+http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS\n\
+PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature\n\
+Update License is provided, please contact the Eclipse Foundation to\n\
+determine what terms and conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples\n\
+of which include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install software,\n\
+documentation, information and/or other materials (collectively "Installable Software").\n\
+This capability is provided with the intent of allowing such users to install,\n\
+extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating\n\
+to the Installable Software to be presented to, and accepted by,\n\
+the users of the Provisioning Technology in accordance with the Specification.\n\
+By using Provisioning Technology in such a manner and making it available in accordance\n\
+with the Specification, you further acknowledge your agreement to,\n\
+and the acquisition of all necessary rights to permit the following:\n\
+\n\
+- A series of actions may occur ("Provisioning Process") in which a user may execute the\n\
+Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+extending or updating the functionality of an Eclipse-based product.\n\
+- During the Provisioning Process, the Provisioning Technology may cause third party\n\
+Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+- Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+govern the use of the Installable Software ("Installable Software Agreement")\n\
+and such Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+with the Specification. Such Installable Software Agreement must inform the user of the terms and\n\
+conditions that govern the Installable Software and must solicit acceptance by the end user in\n\
+the manner prescribed in such Installable Software Agreement.\n\
+Upon such indication of agreement by the user, the provisioning Technology\n\
+will complete installation of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n\
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.management/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.management/feature.xml
new file mode 100755
index 0000000..2009f56
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.management/feature.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+	  id="org.eclipse.virgo.management"
+	  label="%featureName"
+	  version="@VIRGO.VERSION@"
+	  provider-name="%providerName"
+	  image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/gemini/management/">
+	  %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/gemini/management/">
+	  %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+	  %license
+   </license>
+	
+	<plugin
+		id="org.eclipse.virgo.management.fragment"
+		download-size="0"
+		install-size="0"
+		version="@VIRGO.VERSION@"
+		unpack="false"
+		autostart="true"/>
+	
+   <plugin
+		id="org.eclipse.gemini.management"
+		download-size="0"
+		install-size="0"
+		version="@GEMINI.MANAGEMENT.VERSION@"
+		unpack="false"
+		autostart="true"/>
+
+	<plugin
+		id="osgi.enterprise"
+		download-size="0"
+		install-size="0"
+		version="@OSGI.ENTERPRISE.VERSION@"
+		unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.medic/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.medic/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.medic/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.medic/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.medic/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.medic/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.medic/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.medic/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.medic/feature.properties
new file mode 100644
index 0000000..cd17847
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.medic/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Medic Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the Logging and Diagnostics features of an Eclipse Virgo OSGi container.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.medic/feature.xml
new file mode 100755
index 0000000..fdc1e5b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.medic/feature.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.medic"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.virgo.medic"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.virgo.medic.core"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"/>
+   <plugin
+         id="org.eclipse.virgo.medic.logbackcorefragment"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"/>
+   <plugin
+         id="org.eclipse.virgo.medic.logbackclassicfragment"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"/>
+   <plugin
+         id="ch.qos.logback.classic"
+         download-size="0"
+         install-size="0"
+         version="@LOGBACK.CLASSIC.VERSION@"
+         unpack="false"/>
+   <plugin
+         id="ch.qos.logback.core"
+         download-size="0"
+         install-size="0"
+         version="@LOGBACK.CORE.VERSION@"
+         unpack="false"/>
+   <plugin
+         id="slf4j.api"
+         download-size="0"
+         install-size="0"
+         version="@SLF4J.API@"
+         unpack="false"/>
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.medic/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.medic/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.medic/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/feature.properties
new file mode 100644
index 0000000..739a5d9
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Nano WAR Deployer Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the war deployment capabilities of a Virgo Nano instance.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011, 2012 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/feature.xml
new file mode 100755
index 0000000..619cc8b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/feature.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.nano.deployer"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.virgo.ds" version="0.0.0"/>
+   </requires>
+
+    <plugin
+    id="org.eclipse.equinox.event"
+    download-size="0"
+    install-size="0"
+    version="@EQUINOX.EVENT@"
+    unpack="false"/>
+
+    <plugin
+         id="org.eclipse.virgo.nano.deployer"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.deployer/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/build.properties
new file mode 100644
index 0000000..a13e18b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg,\
+               p2.inf
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/feature.properties
new file mode 100644
index 0000000..f63f711
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Virgo Nano MBeans Controller
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the Virgo Nano MBean controller which takes care of exporting them to the MBean server.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/feature.xml
new file mode 100755
index 0000000..598d243
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/feature.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.nano.mbeans.controller"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.virgo.nano.management.controller"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans.controller/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/build.properties
new file mode 100644
index 0000000..a13e18b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg,\
+               p2.inf
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/feature.properties
new file mode 100644
index 0000000..23cf8a2
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Virgo Nano MBeans
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the standard Nano MBean controls such as Deployer and also common for Virgo MBeans such as the Recovery Monitor.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/feature.xml
new file mode 100755
index 0000000..7b10cdb
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/feature.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.nano.mbeans"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+    <plugin
+    id="org.eclipse.virgo.util.jmx"
+    download-size="0"
+    install-size="0"
+    version="@VIRGO.VERSION@"
+    unpack="false"/>
+    
+   <plugin
+         id="org.eclipse.virgo.nano.management"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.mbeans/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/feature.properties
new file mode 100644
index 0000000..aaad62e
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Nano Deployer Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the deployment and hot-deployment capabilities of a Virgo Nano instance.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011, 2012 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/feature.xml
new file mode 100755
index 0000000..3430884
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/feature.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.nano.war.deployer"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.virgo.ds" version="0.0.0"/>
+   </requires>
+
+    <plugin
+         id="org.eclipse.virgo.web.war.deployer"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.nano.war.deployer/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/build.properties
new file mode 100644
index 0000000..a13e18b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg,\
+               p2.inf
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/feature.properties
new file mode 100644
index 0000000..56fa945
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo p2 Provisioning Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the p2 provisioning add-on for Virgo. It enables complete p2 provisioning.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/feature.xml
new file mode 100755
index 0000000..4ad9f00
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/feature.xml
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.p2.provisioning"
+      label="%featureName"
+      version="1.0.0"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+   
+   <requires>
+      <import feature="org.eclipse.virgo.simpleconfigurator" version="0.0.0"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.core.contenttype"
+         download-size="0"
+         install-size="0"
+         version="@CONTENTTYPE.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.core.jobs"
+         download-size="0"
+         install-size="0"
+         version="@JOBS.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.core.runtime"
+         download-size="0"
+         install-size="0"
+         version="@CORE.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+    <plugin
+    id="org.eclipse.core.net"
+    download-size="0"
+    install-size="0"
+    version="@CORE.NET.VERSION@"
+    unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf"
+         download-size="0"
+         install-size="0"
+         version="@ECF.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.ecf.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="@ECF.FT.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.ecf.identity"
+         download-size="0"
+         install-size="0"
+         version="@ECF.I.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="@ECF.P.FT.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.ecf.ssl"
+         download-size="0"
+         install-size="0"
+         version="@ECF.SSL.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.app"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.APP.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.common"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.COMMON.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.frameworkadmin"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.FRKA.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.frameworkadmin.equinox"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.FRKA.E.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.artifact.repository"
+         download-size="0"
+         install-size="0"
+         version="@P2.A.R.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.console"
+         download-size="0"
+         install-size="0"
+         version="@P2.CONSOLE.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.core"
+         download-size="0"
+         install-size="0"
+         version="@P2.CORE.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.director"
+         download-size="0"
+         install-size="0"
+         version="@P2.DIRECTOR.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.engine"
+         download-size="0"
+         install-size="0"
+         version="@P2.ENGINE.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.garbagecollector"
+         download-size="0"
+         install-size="0"
+         version="@P2.GC.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.jarprocessor"
+         download-size="0"
+         install-size="0"
+         version="@P2.JP.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.metadata"
+         download-size="0"
+         install-size="0"
+         version="@P2.METADATA.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.metadata.repository"
+         download-size="0"
+         install-size="0"
+         version="@P2.M.R.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.publisher"
+         download-size="0"
+         install-size="0"
+         version="@P2.PUBLISHER.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.publisher.eclipse"
+         download-size="0"
+         install-size="0"
+         version="@P2.P.E.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.repository"
+         download-size="0"
+         install-size="0"
+         version="@P2.REPOSITORY.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.touchpoint.eclipse"
+         download-size="0"
+         install-size="0"
+         version="@P2.T.E.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.touchpoint.natives"
+         download-size="0"
+         install-size="0"
+         version="@P2.T.N.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.transport.ecf"
+         download-size="0"
+         install-size="0"
+         version="@P2.T.ECF.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.preferences"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.PFRCS.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.registry"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.REGISTRY.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.security"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.SECURITY.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.simpleconfigurator.manipulator"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.SC.M.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.p2.provisioning/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/feature.properties
new file mode 100644
index 0000000..6e3b258
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Diagnostics Concurrent Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides concurrent diagnostics of a Eclipse Virgo OSGi container such as deadlock detection.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/feature.xml
new file mode 100755
index 0000000..bc40ec4
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/feature.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.services.concurrent"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+
+    <plugin
+        id="org.eclipse.virgo.nano.services.concurrent"
+        download-size="0"
+        install-size="0"
+        version="@VIRGO.VERSION@"
+        unpack="false"
+        autostart="true"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.concurrent/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/feature.properties
new file mode 100644
index 0000000..e76d968
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Diagnostics DS Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides DS supportability features of a Eclipse Virgo OSGi container such as unsatisfied services detection.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/feature.xml
new file mode 100755
index 0000000..00884ed
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/feature.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.services.ds"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+    <plugin
+        id="org.eclipse.virgo.nano.services.ds"
+        download-size="0"
+        install-size="0"
+        version="@VIRGO.VERSION@"
+        unpack="false"
+        autostart="true"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.services.ds/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.shell/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.shell/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.shell/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.shell/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.shell/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.shell/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.shell/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.shell/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.shell/feature.properties
new file mode 100644
index 0000000..73c2850
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.shell/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Shell Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides the Shell feature of an Eclipse Virgo OSGi container. It is based on the Equinox console.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.shell/feature.xml
new file mode 100755
index 0000000..1750ee5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.shell/feature.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.shell"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.apache.mina.core"
+         download-size="0"
+         install-size="0"
+         version="@MINA.CORE.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.apache.sshd.core"
+         download-size="0"
+         install-size="0"
+         version="@SSHD.CORE.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.apache.felix.gogo.command"
+         download-size="0"
+         install-size="0"
+         version="@FELIX.GOGO.COMMAND.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.apache.felix.gogo.runtime"
+         download-size="0"
+         install-size="0"
+         version="@FELIX.GOGO.RUNTIME.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.apache.felix.gogo.shell"
+         download-size="0"
+         install-size="0"
+         version="@FELIX.GOGO.SHELL.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.console"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.CONSOLE.VERSION@"
+         unpack="false"
+         autostart="true"/>
+         
+   <plugin
+         id="org.eclipse.equinox.console.ssh"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.CONSOLE.SSH.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.virgo.shell.command"
+         download-size="0"
+         install-size="0"
+         version="@VIRGO.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.shell/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.shell/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.shell/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/build.properties
new file mode 100644
index 0000000..a13e18b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg,\
+               p2.inf
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/feature.properties
new file mode 100644
index 0000000..4399294
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Simple Configurator Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides Equinox's simple configurator for Virgo. It enables more readable initial bundles configuration.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/feature.xml
new file mode 100755
index 0000000..e37e8da
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/feature.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.simpleconfigurator"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.equinox.simpleconfigurator"
+         download-size="0"
+         install-size="0"
+         version="@EQUINOX.SC.VERSION@"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.simpleconfigurator/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/feature.properties
new file mode 100644
index 0000000..cd15877
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo SpringDM Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides a SpringDM add-on for Virgo. It includes the standard SpringDM bundles.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/feature.xml
new file mode 100755
index 0000000..05c6dc3
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/feature.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.springdm"
+      label="%featureName"
+      version="@SPRING.DM.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.gemini.blueprint.core"
+         download-size="0"
+         install-size="0"
+         version="@SPRING.DM.VERSION@"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.gemini.blueprint.extender"
+         download-size="0"
+         install-size="0"
+         version="@SPRING.DM.VERSION@"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.gemini.blueprint.io"
+         download-size="0"
+         install-size="0"
+         version="@SPRING.DM.VERSION@"
+         unpack="false"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.springdm/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.springdm/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.tools/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.tools/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.tools/build.properties
new file mode 100644
index 0000000..db80add
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.tools/build.properties
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.tools/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.tools/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.tools/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.tools/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.tools/feature.properties
new file mode 100644
index 0000000..3e5853e
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.tools/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Virgo Tools Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature packages the internal tools of a Eclipse Virgo OSGi container (for reuse within the Virgo Tooling).\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.tools/feature.xml
new file mode 100755
index 0000000..ca5195a
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.tools/feature.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.tools"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.virgo.util.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.virgo.util.io"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.virgo.util.jmx"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.virgo.util.math"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.virgo.util.osgi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.virgo.util.osgi.manifest"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.virgo.util.parser.manifest"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.virgo.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"
+         autostart="true"/>
+
+   <plugin
+         id="org.eclipse.virgo.medic"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"
+         autostart="true"/>
+
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.tools/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.tools/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.tools/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/build.gradle b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/build.gradle
new file mode 100644
index 0000000..32bcbb5
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/build.gradle
@@ -0,0 +1 @@
+apply plugin: eclipsebuild.FeaturePlugin
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/build.properties b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/build.properties
new file mode 100644
index 0000000..a13e18b
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               epl-v10.html,\
+               eclipse_update_120.jpg,\
+               p2.inf
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/eclipse_update_120.jpg b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/eclipse_update_120.jpg
new file mode 100755
index 0000000..bfdf708
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/eclipse_update_120.jpg
Binary files differ
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/epl-v10.html b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/epl-v10.html
new file mode 100755
index 0000000..eecc800
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/epl-v10.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>Eclipse Public License - Version 1.0</TITLE>
+<STYLE type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {  	
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </STYLE>
+
+</HEAD><BODY lang="EN-US">
+
+<H2>Eclipse Public License - v 1.0</H2>
+
+<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</P>
+
+<P><B>1. DEFINITIONS</B></P>
+
+<P>"Contribution" means:</P>
+
+<P class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</P>
+<P class="list">b) in the case of each subsequent Contributor:</P>
+<P class="list">i) changes to the Program, and</P>
+<P class="list">ii) additions to the Program;</P>
+<P class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</P>
+
+<P>"Contributor" means any person or entity that distributes
+the Program.</P>
+
+<P>"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</P>
+
+<P>"Program" means the Contributions distributed in accordance
+with this Agreement.</P>
+
+<P>"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.</P>
+
+<P><B>2. GRANT OF RIGHTS</B></P>
+
+<P class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</P>
+
+<P class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</P>
+
+<P class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</P>
+
+<P class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</P>
+
+<P><B>3. REQUIREMENTS</B></P>
+
+<P>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</P>
+
+<P class="list">a) it complies with the terms and conditions of this
+Agreement; and</P>
+
+<P class="list">b) its license agreement:</P>
+
+<P class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</P>
+
+<P class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</P>
+
+<P class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</P>
+
+<P class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</P>
+
+<P>When the Program is made available in source code form:</P>
+
+<P class="list">a) it must be made available under this Agreement; and</P>
+
+<P class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</P>
+
+<P>Contributors may not remove or alter any copyright notices contained
+within the Program.</P>
+
+<P>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</P>
+
+<P><B>4. COMMERCIAL DISTRIBUTION</B></P>
+
+<P>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</P>
+
+<P>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</P>
+
+<P><B>5. NO WARRANTY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</P>
+
+<P><B>6. DISCLAIMER OF LIABILITY</B></P>
+
+<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P>
+
+<P><B>7. GENERAL</B></P>
+
+<P>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</P>
+
+<P>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</P>
+
+<P>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</P>
+
+<P>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</P>
+
+<P>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</P>
+
+
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/feature.properties b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/feature.properties
new file mode 100644
index 0000000..f30a8e2
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/feature.properties
@@ -0,0 +1,180 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Virgo Web Admin Console Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+
+# "description" property - description of the feature
+description=This feature provides Virgo's web management console.\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2009, 2010, 2011 VMware Inc. and others\n\
+\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+and Apache License v2.0 which accompanies this distribution.\n\
+The Eclipse Public License is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+and the Apache License v2.0 is available at\n\
+http://www.opensource.org/licenses/apache2.0.php.\n\
+You may elect to redistribute this code under either of these\n\
+licenses.\n\
+\n\
+Contributors:\n\
+VMware Inc. - initial contribution\n\
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+       - Content may be structured and packaged into modules to facilitate delivering,\n\
+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+         plug-in fragments ("Fragments"), and features ("Features").\n\
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+         in a directory named "plugins".\n\
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+       - The top-level (root) directory\n\
+       - Plug-in and Fragment directories\n\
+       - Inside Plug-ins and Fragments packaged as JARs\n\
+       - Sub-directories of the directory named "src" of certain Plug-ins\n\
+       - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+          extending or updating the functionality of an Eclipse-based product.\n\
+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+          with the Specification. Such Installable Software Agreement must inform the user of the\n\
+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+          indication of agreement by the user, the provisioning Technology will complete installation\n\
+          of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/feature.xml b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/feature.xml
new file mode 100755
index 0000000..7fb9e20
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/feature.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.virgo.webconsole.deps"
+      label="%featureName"
+      version="@VIRGO.VERSION@"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg">
+
+   <description url="http://www.eclipse.org/virgo/">
+      %description
+   </description>
+
+   <copyright url="http://www.eclipse.org/virgo/">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+    
+    <plugin
+    id="org.eclipse.gemini.management"
+    download-size="0"
+    install-size="0"
+    version="@GEMINI.MANAGEMENT.VERSION@"
+    unpack="false"/>
+    
+    <plugin
+    id="org.eclipse.virgo.management.fragment"
+    download-size="0"
+    install-size="0"
+    version="@VIRGO.VERSION@"
+    unpack="false"/>
+    
+    <plugin
+    id="org.apache.commons.fileupload"
+    download-size="0"
+    install-size="0"
+    version="@C.FILEUPLOAD.VERSION@"
+    unpack="false"/>
+    
+    <plugin
+    id="org.apache.commons.io"
+    download-size="0"
+    install-size="0"
+    version="@C.IO.VERSION@"
+    unpack="false"/>
+    
+    <plugin
+    id="org.jolokia.osgi"
+    download-size="0"
+    install-size="0"
+    version="@JOLOKIA.VERSION@"
+    unpack="false"/>
+    
+    <plugin
+    id="javax.servlet"
+    download-size="0"
+    install-size="0"
+    version="@JAVAX.SERVLET@"
+    unpack="false"/>
+    
+</feature>
diff --git a/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/license.html b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/license.html
new file mode 100755
index 0000000..f19c483
--- /dev/null
+++ b/org.eclipse.virgo.site/org.eclipse.virgo.webconsole.deps/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/org.eclipse.virgo.site/p2.index b/org.eclipse.virgo.site/p2.index
new file mode 100644
index 0000000..4c62321
--- /dev/null
+++ b/org.eclipse.virgo.site/p2.index
@@ -0,0 +1,3 @@
+version = 1
+ metadata.repository.factory.order = content.xml,\!
+ artifact.repository.factory.order = artifacts.xml,\!
\ No newline at end of file
diff --git a/org.eclipse.virgo.site/publish_resources/products/base/base.product b/org.eclipse.virgo.site/publish_resources/products/base/base.product
new file mode 100755
index 0000000..e5ebdd3
--- /dev/null
+++ b/org.eclipse.virgo.site/publish_resources/products/base/base.product
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?pde version="3.5"?>

+

+<product name="Eclipse Virgo Base Product" uid="base.product" version="1.0.0" useFeatures="true" includeLaunchers="false">

+

+   <configIni use="default">

+   </configIni>

+   

+   <vm>

+   </vm>

+

+   <plugins>

+   </plugins>

+

+   <features>

+      <feature id="org.eclipse.virgo.core" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.medic" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.shell" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.ds" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.nano.mbeans" version="0.0.0"/>

+	  <feature id="org.eclipse.virgo.simpleconfigurator" version="0.0.0"/>

+   </features>

+   

+   <configurations>

+		<plugin id="org.eclipse.equinox.cm" autoStart="true" />

+		<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1"/>

+		<plugin id="org.eclipse.equinox.event" autoStart="true" />

+		<plugin id="org.eclipse.equinox.common" autoStart="true" />

+		<plugin id="org.eclipse.equinox.console.supportability" autoStart="true" />

+		<plugin id="org.eclipse.equinox.region" autoStart="true" />

+		<plugin id="org.eclipse.equinox.util" autoStart="true" />

+		<plugin id="org.eclipse.osgi.services" autoStart="true" />

+		<plugin id="org.eclipse.virgo.medic" autoStart="true" startLevel="3"/>

+		<plugin id="org.eclipse.virgo.medic.core" autoStart="true" startLevel="3"/>

+		<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="3"/>

+		<plugin id="org.eclipse.virgo.util.osgi" autoStart="true"/>

+		

+		<property name="osgi.compatibility.bootdelegation" value="false"/>

+		<property name="equinox.use.ds" value="true"/>

+		<property name="osgi.console.enable.builtin" value="false"/>

+		<property name="gosh.args" value="--nointeractive"/>

+		<property name="osgi.console.ssh.useDefaultSecureStorage" value="false"/>

+		<property name="osgi.console.useConfigAdmin" value="true"/>

+		<property name="osgi.parentClassloader" value="fwk"/>

+		<property name="equinox.refresh.duplicate.bsn" value="false"/>

+		<property name="eclipse.bundle.setTCCL" value="false"/>

+		<property name="org.eclipse.virgo.suppress.heap.dumps" value="false"/>

+		<property name="osgi.bundlefile.limit" value="500"/>

+		<property name="osgi.java.profile.bootdelegation" value="override"/>

+		<property name="osgi.compatibility.eagerStart.LazyActivation" value="false"/>

+		<property name="osgi.support.multipleHosts" value="true"/>

+		<property name="org.eclipse.virgo.medic.log.config.path" value="configuration/serviceability.xml"/>

+		<property name="osgi.context.bootdelegation" value="false"/>

+		<property name="eclipse.enableStateSaver" value="false"/>

+		<property name="osgi.hook.configurators.include" value="org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator"/>

+		<property name="org.eclipse.virgo.kernel.startup.wait.limit" value="180"/>
+		<property name="gosh.home" value="configuration"/>

+	</configurations>

+

+</product>

diff --git a/org.eclipse.virgo.site/publish_resources/products/kernel-base/kernel-base.product b/org.eclipse.virgo.site/publish_resources/products/kernel-base/kernel-base.product
new file mode 100755
index 0000000..ae13b01
--- /dev/null
+++ b/org.eclipse.virgo.site/publish_resources/products/kernel-base/kernel-base.product
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?pde version="3.5"?>

+

+<product name="Eclipse Virgo Kernel Base Product" uid="kernel-base.product" version="1.0.0" useFeatures="true" includeLaunchers="false">

+

+   <configIni use="default">

+   </configIni>

+   

+   <vm>

+   </vm>

+

+   <plugins>

+   </plugins>

+

+   <features>

+      <feature id="org.eclipse.virgo.kernel" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.kernel.springintegration" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.springdm" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.management" version="0.0.0" />

+   </features>

+

+   <configurations>

+		<plugin id="org.apache.commons.codec" autoStart="true"/>

+		<plugin id="oevm.org.apache.commons.httpclient" autoStart="true"/>

+ 

+		<property name="org.osgi.framework.bsnversion" value="multiple"/>

+		<property name="osgi.clean" value="true"/>

+		<property name="org.osgi.service.http.port" value="8080"/>

+		<property name="org.jolokia.listenForHttpService" value="false"/>

+		<property name="org.jolokia.useRestrictorService" value="true"/>

+	</configurations>

+

+</product>

diff --git a/org.eclipse.virgo.site/publish_resources/products/kernel-base/p2.inf b/org.eclipse.virgo.site/publish_resources/products/kernel-base/p2.inf
new file mode 100644
index 0000000..bdbdfc7
--- /dev/null
+++ b/org.eclipse.virgo.site/publish_resources/products/kernel-base/p2.inf
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+requires.0.name = base.product
+requires.0.namespace = org.eclipse.equinox.p2.iu
+requires.0.range = 0.0.0
diff --git a/org.eclipse.virgo.site/publish_resources/products/nano-base/nano-base.product b/org.eclipse.virgo.site/publish_resources/products/nano-base/nano-base.product
new file mode 100755
index 0000000..3c796af
--- /dev/null
+++ b/org.eclipse.virgo.site/publish_resources/products/nano-base/nano-base.product
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?pde version="3.5"?>

+

+<product name="Eclipse Virgo Nano Product" uid="nano-base.product" version="1.0.0" useFeatures="true" includeLaunchers="false">

+

+   <configIni use="default">

+   </configIni>

+   

+   <vm>

+   </vm>

+

+   <plugins>

+   </plugins>

+

+   <features>

+	  <feature id="org.eclipse.virgo.nano.deployer" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.nano.mbeans.controller" version="0.0.0"/>

+	  <feature id="org.eclipse.virgo.services.concurrent" version="0.0.0"/>

+	  <feature id="org.eclipse.virgo.services.ds" version="0.0.0"/>

+	  <feature id="org.eclipse.virgo.webconsole.deps" version="0.0.0"/>

+   </features>

+   

+   <configurations>

+      <plugin id="org.jolokia.osgi" autoStart="true" />

+   	  <plugin id="org.eclipse.gemini.management" autoStart="true" />

+   	  <plugin id="org.eclipse.equinox.http" autoStart="true" />

+

+	  <plugin id="org.eclipse.virgo.nano.core" autoStart="true" startLevel="4"/>

+	  <plugin id="org.eclipse.virgo.nano.deployer" autoStart="true" startLevel="5"/>

+	  <property name="org.eclipse.virgo.fschecker.initialEventMode" value="bulk"/>

+   </configurations>	

+

+</product>

diff --git a/org.eclipse.virgo.site/publish_resources/products/nano-base/p2.inf b/org.eclipse.virgo.site/publish_resources/products/nano-base/p2.inf
new file mode 100644
index 0000000..57cf7df
--- /dev/null
+++ b/org.eclipse.virgo.site/publish_resources/products/nano-base/p2.inf
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2011 SAP AG
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+# The Eclipse Public License is available at
+#   http://www.eclipse.org/legal/epl-v10.html
+# and the Apache License v2.0 is available at
+#   http://www.opensource.org/licenses/apache2.0.php.
+# You may elect to redistribute this code under either of these licenses.
+#
+# Contributors:
+#   Borislav Kapukaranov - initial contribution
+###############################################################################
+requires.0.name = nano-core.product
+requires.0.namespace = org.eclipse.equinox.p2.iu
+requires.0.range = 0.0.0
diff --git a/org.eclipse.virgo.site/publish_resources/products/nano-core/nano-core.product b/org.eclipse.virgo.site/publish_resources/products/nano-core/nano-core.product
new file mode 100755
index 0000000..553c970
--- /dev/null
+++ b/org.eclipse.virgo.site/publish_resources/products/nano-core/nano-core.product
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?pde version="3.5"?>

+

+<product name="Eclipse Virgo Base Product" uid="nano-core.product" version="1.0.0" useFeatures="true" includeLaunchers="false">

+

+   <configIni use="default">

+   </configIni>

+   

+   <vm>

+   </vm>

+

+   <plugins>

+   </plugins>

+

+   <features>

+      <feature id="org.eclipse.virgo.core" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.medic" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.shell" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.ds" version="0.0.0"/>

+      <feature id="org.eclipse.virgo.nano.mbeans" version="0.0.0"/>

+	  <feature id="org.eclipse.virgo.simpleconfigurator" version="0.0.0"/>

+   </features>

+   

+   <configurations>

+		<plugin id="org.eclipse.equinox.cm" autoStart="true" />

+		<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1"/>

+		<plugin id="org.eclipse.equinox.event" autoStart="true" />

+		<plugin id="org.eclipse.equinox.common" autoStart="true" />

+		<plugin id="org.eclipse.equinox.console.supportability" autoStart="true" />

+		<plugin id="org.eclipse.equinox.region" autoStart="true" />

+		<plugin id="org.eclipse.equinox.util" autoStart="true" />

+		<plugin id="org.eclipse.osgi.services" autoStart="true" />

+		<plugin id="org.eclipse.virgo.medic" autoStart="true" startLevel="3"/>

+		<plugin id="org.eclipse.virgo.medic.core" autoStart="true" startLevel="3"/>

+		<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="3"/>

+		<plugin id="org.eclipse.virgo.util.osgi" autoStart="true"/>

+		

+		<property name="osgi.compatibility.bootdelegation" value="false"/>

+		<property name="equinox.use.ds" value="true"/>

+		<property name="osgi.console.enable.builtin" value="false"/>

+		<property name="gosh.args" value="--nointeractive"/>

+		<property name="osgi.console.ssh.useDefaultSecureStorage" value="false"/>

+		<property name="osgi.console.useConfigAdmin" value="true"/>

+		<property name="osgi.parentClassloader" value="fwk"/>

+		<property name="equinox.refresh.duplicate.bsn" value="false"/>

+		<property name="eclipse.bundle.setTCCL" value="false"/>

+		<property name="org.eclipse.virgo.suppress.heap.dumps" value="false"/>

+		<property name="osgi.bundlefile.limit" value="500"/>

+		<property name="osgi.java.profile.bootdelegation" value="override"/>

+		<property name="osgi.compatibility.eagerStart.LazyActivation" value="false"/>

+		<property name="osgi.support.multipleHosts" value="true"/>

+		<property name="org.eclipse.virgo.medic.log.config.path" value="configuration/serviceability.xml"/>

+		<property name="osgi.context.bootdelegation" value="false"/>

+		<property name="eclipse.enableStateSaver" value="false"/>

+		<property name="org.eclipse.virgo.kernel.startup.wait.limit" value="180"/>

+		<property name="gosh.home" value="configuration"/>

+	</configurations>

+

+</product>

diff --git a/org.eclipse.virgo.site/updateCompositeUpdateSite.sh b/org.eclipse.virgo.site/updateCompositeUpdateSite.sh
new file mode 100755
index 0000000..6ff3d71
--- /dev/null
+++ b/org.eclipse.virgo.site/updateCompositeUpdateSite.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# count the child directories and create a 'child' node for each one
+children=""
+numOfChildren=0
+for directory in */ ; do
+    children="$children<child location='$directory'/> "
+    ((numOfChildren++))
+done
+
+# define the repository name and the timestamp
+repository='Virgo'
+timestamp=$(date +%s)
+
+# create compositeArtifacts.xml
+cat > compositeArtifacts.xml <<EOF
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='$repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+   <properties size='3'>
+    <property name='p2.timestamp' value='$timestamp'/>
+    <property name='p2.compressed' value='true'/>
+    <property name='p2.atomic.composite.loading' value='true'/>
+  </properties>
+  <children size='$numOfChildren'>
+    $children
+  </children>
+</repository>
+EOF
+
+# create compositeContent.xml
+cat > compositeContent.xml <<EOF
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='$repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+   <properties size='3'>
+    <property name='p2.timestamp' value='$timestamp'/>
+    <property name='p2.compressed' value='true'/>
+    <property name='p2.atomic.composite.loading' value='true'/>
+  </properties>
+  <children size='$numOfChildren'>
+    $children
+  </children>
+</repository>
+EOF
+
+# create p2.index file
+cat > p2.index <<"EOF"
+version=1
+metadata.repository.factory.order=compositeContent.xml,\!
+artifact.repository.factory.order=compositeArtifacts.xml,\!
+EOF
+
+# package the xml files into jars and delete them
+jar cvMf compositeArtifacts.jar compositeArtifacts.xml > /dev/null
+jar cvMf compositeContent.jar compositeContent.xml > /dev/null
+rm compositeArtifacts.xml
+rm compositeContent.xml
diff --git a/run_local_smoketest.sh b/run_local_smoketest.sh
new file mode 100755
index 0000000..98b8654
--- /dev/null
+++ b/run_local_smoketest.sh
@@ -0,0 +1,2 @@
+./gradlew -Dci.build=true -Dskip.normalize.bundles=true -Dskip.local.signing=true -Dskip.compress.bundles=true --stacktrace clean jar build distZip fullDistZip rapDistZip installDist installFullDist installRapDist smokeTest -x test -x findBugsMain -x findBugsTest
+
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..7f355ba
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,139 @@
+
+include ':util:org.eclipse.virgo.util.common'
+include ':util:org.eclipse.virgo.util.env'
+include ':util:org.eclipse.virgo.util.io'
+include ':util:org.eclipse.virgo.util.jmx'
+include ':util:org.eclipse.virgo.util.math'
+include ':util:org.eclipse.virgo.util.osgi'
+include ':util:org.eclipse.virgo.util.osgi.manifest'
+include ':util:org.eclipse.virgo.util.parser.launcher'
+include ':util:org.eclipse.virgo.util.parser.manifest'
+
+include ':test:org.eclipse.virgo.test.stubs'
+include ':medic:org.eclipse.virgo.medic.test'
+
+include ':medic:org.eclipse.virgo.medic'
+include ':medic:org.eclipse.virgo.medic.core'
+include ':medic:org.eclipse.virgo.medic.logbackcorefragment'
+include ':medic:org.eclipse.virgo.medic.logbackclassicfragment'
+
+include ':repository:org.eclipse.virgo.repository'
+
+include ':nano:org.eclipse.virgo.nano.authentication'
+include ':nano:org.eclipse.virgo.nano.core'
+include ':nano:org.eclipse.virgo.nano.deployer'
+include ':nano:org.eclipse.virgo.nano.deployer.api'
+include ':nano:org.eclipse.virgo.nano.deployer.hot'
+include ':nano:org.eclipse.virgo.nano.management'
+include ':nano:org.eclipse.virgo.nano.management.controller'
+include ':nano:org.eclipse.virgo.nano.services.concurrent'
+include ':nano:org.eclipse.virgo.nano.services.ds'
+include ':nano:org.eclipse.virgo.nano.shutdown'
+
+include ':kernel:org.eclipse.virgo.kernel.agent.dm'
+include ':kernel:org.eclipse.virgo.kernel.artifact'
+include ':kernel:org.eclipse.virgo.kernel.deployer'
+include ':kernel:org.eclipse.virgo.kernel.osgi'
+include ':kernel:org.eclipse.virgo.kernel.stubs'
+include ':kernel:org.eclipse.virgo.kernel.deployer.dm'
+include ':kernel:org.eclipse.virgo.kernel.dmfragment'
+include ':kernel:org.eclipse.virgo.kernel.equinox.extensions'
+include ':kernel:org.eclipse.virgo.kernel.kerneldmfragment'
+include ':kernel:org.eclipse.virgo.kernel.model'
+include ':kernel:org.eclipse.virgo.kernel.osgi'
+include ':kernel:org.eclipse.virgo.kernel.services'
+include ':kernel:org.eclipse.virgo.kernel.userregion'
+include ':kernel:org.eclipse.virgo.kernel.userregionfactory'
+include ':kernel:org.eclipse.virgo.management.console'
+include ':kernel:org.eclipse.virgo.management.fragment'
+include ':kernel:org.eclipse.virgo.shell.command'
+
+include ':web:org.eclipse.virgo.web.core'
+include ':web:org.eclipse.virgo.web.dm'
+include ':web:org.eclipse.virgo.web.enterprise.openejb.jpa.integration'
+include ':web:org.eclipse.virgo.web.servlet.adapter'
+include ':web:org.eclipse.virgo.web.spring.integration'
+include ':web:org.eclipse.virgo.web.tomcat.support'
+include ':web:org.eclipse.virgo.web.enterprise.appdeployer'
+include ':web:org.eclipse.virgo.web.enterprise.applistener'
+include ':web:org.eclipse.virgo.web.enterprise.jsf.support'
+include ':web:org.eclipse.virgo.web.enterprise.openejb.fragment.bval'
+include ':web:org.eclipse.virgo.web.enterprise.openejb.fragment.jotm'
+include ':web:org.eclipse.virgo.web.enterprise.openejb.fragment.jpa'
+include ':web:org.eclipse.virgo.web.enterprise.openejb.initialiser'
+include ':web:org.eclipse.virgo.web.enterprise.services.accessor'
+include ':web:org.eclipse.virgo.web.enterprise.security'
+include ':web:org.eclipse.virgo.web.enterprise.security.valve'
+include ':web:org.eclipse.virgo.web.enterprise.security.openejb.classloading.hook'
+include ':web:org.eclipse.virgo.web.enterprise.catalina.fragment.webbeans'
+include ':web:org.eclipse.virgo.web.enterprise.openejb.fragment.webbeans'
+include ':web:org.eclipse.virgo.web.enterprise.openwebbeans.initialiser'
+include ':web:org.eclipse.virgo.web.enterprise.persistence.openejb.classloading.hook'
+include ':web:org.eclipse.virgo.web.enterprise.javax.persistence.extension'
+include ':web:org.eclipse.virgo.web.enterprise.javax.persistence.provider.initializer'
+include ':web:org.eclipse.virgo.web.enterprise.openejb.tomcat.factory'
+include ':web:org.eclipse.virgo.web.war.deployer'
+
+include ':apps:org.eclipse.virgo.apps.repository.core'
+include ':apps:org.eclipse.virgo.apps.repository.web'
+include ':apps:org.eclipse.virgo.apps.splash'
+
+include ':util:org.eclipse.virgo.util.integrationtest'
+//include ':medic:org.eclipse.virgo.medic.integrationtest'
+
+if (System.properties['include.docs'] == 'true') {
+	include ':documentation:programmer-guide'
+	include ':documentation:tooling-guide'
+	include ':documentation:user-guide'
+}
+
+include ':org.eclipse.virgo.site'
+// TODO - rename feature to region'_'
+include ':org.eclipse.virgo.site:org.eclipse.equinox.regions'
+include ':org.eclipse.virgo.site:org.eclipse.equinox.http.jetty'
+include ':org.eclipse.virgo.site:org.eclipse.rap'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.core'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.ds'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.kernel'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.kernel.springintegration'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.management'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.medic'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.deployer'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.mbeans.controller'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.services.concurrent'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.services.ds'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.shell'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.simpleconfigurator'
+// TODO - rename feature to org.eclipse.gemini.blueprint
+include ':org.eclipse.virgo.site:org.eclipse.virgo.springdm'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.webconsole.deps'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.p2.provisioning'
+include ':org.eclipse.virgo.site:org.eclipse.gemini.web'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.nano.war.deployer'
+include ':org.eclipse.virgo.site:org.eclipse.virgo.enterprise'
+
+include ':org.eclipse.virgo.site:org.eclipse.virgo.tools'
+
+include ':packaging:nano'
+include ':packaging:kernel'
+include ':packaging:jetty-server'
+include ':packaging:tomcat-server'
+
+// included as required from Virgo Snaps
+include ':test:org.eclipse.virgo.test.launcher'
+include ':test:org.eclipse.virgo.test.framework'
+
+if (System.properties['skip.smoke.tests'] != 'true') {
+	include ':test:org.eclipse.virgo.test.tools'
+	include ':packaging:nano:org.eclipse.virgo.nano.smoketest'
+	include ':packaging:kernel:org.eclipse.virgo.kernel.smoketest'
+	include ':packaging:jetty-server:org.eclipse.virgo.jetty.smoketest'
+	include ':packaging:tomcat-server:org.eclipse.virgo.tomcat.smoketest'
+
+	// TODO - check if this module is still needed - only in unused?! feature org.eclipse.virgo.nano.detailed
+	// include ':web:org.eclipse.virgo.web.war.deployer'
+
+	// include ':system-tests:org.eclipse.virgo.server.svt' // TODO revive system verification tests: https://bugs.eclipse.org/bugs/show_bug.cgi?id=386636#c6
+	// include ':performance-tests:org.eclipse.virgo.qa.performance'
+}