initial checkin from dm Server sample-configuration-properties commit 47070cd13b5d38f7e1eeeaa281b85bf6b7bc1af7
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5f193ca
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+target
+integration-repo
+ivy-cache
diff --git a/build-configuration-properties/About.html b/build-configuration-properties/About.html
new file mode 100644
index 0000000..faffa5b
--- /dev/null
+++ b/build-configuration-properties/About.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- saved from url=(0043)http://www.eclipse.org/legal/epl/about.html -->
+<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<TITLE>About</TITLE>
+</HEAD><BODY lang="EN-US">
+<H2>About This Content</H2>
+ 
+<P>June 5, 2006</P>	
+<H3>License</H3>
+
+<P>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is 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, "Program" will mean the Content.</P>
+
+<P>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <A href="http://www.eclipse.org/">http://www.eclipse.org</A>.</P>
+
+
+</BODY></HTML>
\ No newline at end of file
diff --git a/build-configuration-properties/build.xml b/build-configuration-properties/build.xml
new file mode 100644
index 0000000..863f6da
--- /dev/null
+++ b/build-configuration-properties/build.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="build-configuration-properties">
+
+	<path id="unit.test.bundles"/>
+
+	<path id="bundles">
+		<path refid="unit.test.bundles" />
+		<pathelement location="../org.eclipse.virgo.sample.configuration.properties.properties"/>
+		<pathelement location="../org.eclipse.virgo.sample.configuration.properties.core"/>
+		<pathelement location="../org.eclipse.virgo.sample.configuration.properties.web"/>
+	</path>
+
+	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
+	<import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
+
+	<target name="precommit" depends="clean, clean-integration, test, findbugs"
+		description="Performs a CI server-like build, should be run prior to performing a Git push"/>
+
+</project>
diff --git a/build-configuration-properties/epl-v10.html b/build-configuration-properties/epl-v10.html
new file mode 100644
index 0000000..eecc800
--- /dev/null
+++ b/build-configuration-properties/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/build-configuration-properties/notice.html b/build-configuration-properties/notice.html
new file mode 100644
index 0000000..0ee73f4
--- /dev/null
+++ b/build-configuration-properties/notice.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
+<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 14, 2010</P>
+
+<H3>Usage Of Content</H3>
+
+<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY "CONTENT").  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
+   ("EPL").  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, "Program" 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 ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</LI>
+       <LI>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features".  Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses").  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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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>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 ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively "Installable Software"). 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>
+   ("Specification").</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 ("Provisioning Process") in which a user may execute the Provisioning Technology
+       on a machine ("Target Machine") 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 ("Installable Software Agreement") 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>
\ No newline at end of file
diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000..fb10b5c
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,7 @@
+version=2.0.0
+release.type=integration
+natural.name=configuration-properties
+project.name=Virgo Web Server Samples
+project.key=VWSS
+ivy.cache.dir=${basedir}/../../ivy-cache
+integration.repo.dir=${basedir}/../../integration-repo
diff --git a/build.versions b/build.versions
new file mode 100644
index 0000000..9a796c9
--- /dev/null
+++ b/build.versions
@@ -0,0 +1,27 @@
+# Compile
+org.eclipse.virgo.kernel=2.1.0.D-20100331094249
+org.eclipse.virgo.osgi=2.1.0.D-20100331093025
+org.eclipse.virgo.repository=2.1.0.D-20100331094008
+org.eclipse.virgo.util=2.1.0.D-20100331093222
+javax.annotation=1.0.0
+javax.servlet.jsp=2.1.0
+javax.servlet.jstl=1.1.2
+javax.servlet=2.5.0
+org.aopalliance=1.0.0
+org.apache.taglibs.standard=1.1.2
+org.apache.xmlcommons=1.3.3
+org.aspectj=1.6.6.RELEASE
+org.eclipse.osgi=3.5.1.R35x_v20091005
+org.slf4j=1.5.10
+org.springframework.js=2.0.8.RELEASE
+org.springframework.osgi=1.2.1
+org.springframework=3.0.0.RELEASE
+org.apache.felix=1.2.4
+org.apache.felix.eventadmin=1.0.0
+
+# Test
+org.eclipse.virgo.teststubs=1.0.0.D-20100513114711
+org.eclipse.virgo.test=2.1.0.D-20100331093519
+org.junit.spring.3=4.7.0
+javax.el=1.0.0
+org.easymock=2.3.0
\ No newline at end of file
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/.classpath b/org.eclipse.virgo.sample.configuration.properties.core/.classpath
new file mode 100644
index 0000000..ff64a30
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/.classpath
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java">
+		<attributes>
+			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/main/resources">
+		<attributes>
+			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC1/org.springframework.context-sources-3.0.0.RC1.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RC1/org.springframework.core-sources-3.0.0.RC1.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC1/org.springframework.beans-sources-3.0.0.RC1.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/.project b/org.eclipse.virgo.sample.configuration.properties.core/.project
new file mode 100644
index 0000000..ade7b4d
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/.project
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.virgo.sample.configuration.properties.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.springsource.server.ide.bundlor.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.virgo.sample.configuration.properties.core/.settings/com.springsource.server.ide.bundlor.core.prefs
new file mode 100644
index 0000000..eb109f7
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/.settings/com.springsource.server.ide.bundlor.core.prefs
@@ -0,0 +1,3 @@
+#Wed Jun 10 16:12:45 BST 2009
+com.springsource.server.ide.bundlor.core.template.properties.files=
+eclipse.preferences.version=1
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.virgo.sample.configuration.properties.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..c7ec0a9
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Mon Aug 24 17:25:29 BST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.sample.configuration.properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..31a5903
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="SpringSource dm Server (Runtime) v2.0"/>
+  <installed facet="com.springsource.server.bundle" version="1.0"/>
+</faceted-project>
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/.springBeans b/org.eclipse.virgo.sample.configuration.properties.core/.springBeans
new file mode 100644
index 0000000..34b281c
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/.springBeans
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.3.0.200912170948-RELEASE]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/build.xml b/org.eclipse.virgo.sample.configuration.properties.core/build.xml
new file mode 100644
index 0000000..cafc16c
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.virgo.sample.configuration.properties.core">
+
+	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
+	<import file="${basedir}/../virgo-build/standard/default.xml"/>
+
+</project>
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/ivy.xml b/org.eclipse.virgo.sample.configuration.properties.core/ivy.xml
new file mode 100644
index 0000000..7c2782a
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/ivy.xml
@@ -0,0 +1,37 @@
+<?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.samples" module="${ant.project.name}"/>
+
+	<configurations>
+		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
+		<!-- === PROVIDED-COMPILE============================================ -->
+
+		<!-- === RUNTIME-DEFAULT =========================================== -->
+
+		<!-- === PROVIDED-RUNTIME =========================================== -->
+		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
+		<dependency org="org.apache.felix" name="org.apache.felix.configadmin" rev="${org.apache.felix}" conf="provided->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="provided->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="provided->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="provided->runtime"/>
+		<dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="provided->runtime"/>		
+		<!-- === TEST ====================================================== -->
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.spring.3}" conf="test->runtime"/>
+		<dependency org="org.eclipse.virgo.teststubs" name="org.eclipse.virgo.teststubs.osgi" rev="${org.eclipse.virgo.teststubs}" conf="test->runtime"/>
+		
+	</dependencies>
+
+</ivy-module>
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/PropertiesService.java b/org.eclipse.virgo.sample.configuration.properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/PropertiesService.java
new file mode 100644
index 0000000..fb56569
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/PropertiesService.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * 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.sample.configuration.properties.core;
+
+import java.util.Map;
+
+/**
+ */
+public interface PropertiesService {
+
+
+    /**
+     * 
+     * @return
+     */
+    Map<String, String> getProperties();
+
+}
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/StandardPropertiesService.java b/org.eclipse.virgo.sample.configuration.properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/StandardPropertiesService.java
new file mode 100644
index 0000000..abfe28d
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/src/main/java/org/eclipse/virgo/sample/configuration/properties/core/StandardPropertiesService.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.sample.configuration.properties.core;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ */
+final class StandardPropertiesService implements PropertiesService{
+
+    private final Map<String, String> result;
+    
+    public StandardPropertiesService(String driverClassName, String url, String username, String password) {
+		this.result = new HashMap<String, String>();
+		this.result.put("driverClassName", driverClassName);
+		this.result.put("url", url);
+		this.result.put("username", username);
+		this.result.put("password", password);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Map<String, String> getProperties(){
+        return this.result;
+    }
+
+}
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3238258
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0

+Export-Package: org.eclipse.virgo.sample.configuration.properties.core

+ ;version="2.0.0";uses:="org.osgi.service.cm"

+Bundle-Version: 2.0.0

+Tool: Bundlor 1.0.0.BUILD-20091207202403

+Bundle-Name: Configuration Sample Content Bundle

+Bundle-ManifestVersion: 2

+Bundle-Description: Configuration Sample Content Provider

+Bundle-SymbolicName: org.eclipse.virgo.sample.configuration.properties

+ .core

+Import-Package: org.osgi.service.cm;version="0"

+

diff --git a/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/spring/module-context.xml b/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/spring/module-context.xml
new file mode 100644
index 0000000..bf6beaf
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/spring/module-context.xml
@@ -0,0 +1,19 @@
+<?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:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+			http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+<!-- ARTEFACT MANAGER -->
+
+	<bean id="propertiesService" class="org.eclipse.virgo.sample.configuration.properties.core.StandardPropertiesService">
+		<constructor-arg value="${driverClassName}"/>
+		<constructor-arg value="${url}"/>
+		<constructor-arg value="${username}"/>
+		<constructor-arg value="${password}"/>
+	</bean>
+
+	<context:property-placeholder properties-ref="configAdminProperties"/>
+
+</beans>
\ No newline at end of file
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/spring/osgi-context.xml b/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/spring/osgi-context.xml
new file mode 100644
index 0000000..530c4da
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/spring/osgi-context.xml
@@ -0,0 +1,16 @@
+<?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"
+	xmlns:osgi-compendium="http://www.springframework.org/schema/osgi-compendium"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.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-1.2.xsd">
+
+
+    <osgi:service ref="propertiesService" interface="org.eclipse.virgo.sample.configuration.properties.core.PropertiesService"/>
+
+	<osgi-compendium:cm-properties id="configAdminProperties" persistent-id="org.eclipse.virgo.sample.configuration"/>
+	
+</beans>
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/src/test/java/.gitignore b/org.eclipse.virgo.sample.configuration.properties.core/src/test/java/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/src/test/java/.gitignore
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/.gitignore b/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/.gitignore
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/META-INF/TEST.MF b/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/META-INF/TEST.MF
new file mode 100644
index 0000000..3ec0672
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/src/test/resources/META-INF/TEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+

diff --git a/org.eclipse.virgo.sample.configuration.properties.core/template.mf b/org.eclipse.virgo.sample.configuration.properties.core/template.mf
new file mode 100644
index 0000000..f9cda66
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.core/template.mf
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-Name: Configuration Sample Content Bundle
+Bundle-Description: Configuration Sample Content Provider
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.virgo.sample.configuration.properties.core
+Bundle-Version: 2.0.0
+Import-Template: 
+ javax.management.*;version="0",
+ org.springframework.*;version="[3.0,3.1)",
+ org.osgi.framework.*;version="0",
+ org.osgi.service.cm.*;version="0"
+Excluded-Imports: 
+ org.junit,
+ org.eclipse.virgo.sample.configuration.*
diff --git a/org.eclipse.virgo.sample.configuration.properties.properties/.project b/org.eclipse.virgo.sample.configuration.properties.properties/.project
new file mode 100644
index 0000000..981320e
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.properties/.project
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.virgo.sample.configuration.properties.properties</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.virgo.sample.configuration.properties.properties/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.sample.configuration.properties.properties/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..801f856
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.properties/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="com.springsource.server.bundle" version="1.0"/>
+</faceted-project>
diff --git a/org.eclipse.virgo.sample.configuration.properties.properties/build.xml b/org.eclipse.virgo.sample.configuration.properties.properties/build.xml
new file mode 100644
index 0000000..0379809
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.properties/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.virgo.sample.configuration.properties.properties">
+
+	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
+	<import file="${basedir}/../virgo-build/resource/default.xml"/>
+
+</project>
diff --git a/org.eclipse.virgo.sample.configuration.properties.properties/ivy.xml b/org.eclipse.virgo.sample.configuration.properties.properties/ivy.xml
new file mode 100644
index 0000000..337f93b
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.properties/ivy.xml
@@ -0,0 +1,21 @@
+<?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.samples" module="${ant.project.name}"/>
+
+	<configurations>
+		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<publications>
+		<artifact name="org.eclipse.virgo.sample.configuration" type="resource" ext="properties" />
+	</publications>
+
+	<dependencies>
+	</dependencies>
+
+</ivy-module>
diff --git a/org.eclipse.virgo.sample.configuration.properties.properties/src/org.eclipse.virgo.sample.configuration.properties b/org.eclipse.virgo.sample.configuration.properties.properties/src/org.eclipse.virgo.sample.configuration.properties
new file mode 100644
index 0000000..3b03725
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.properties/src/org.eclipse.virgo.sample.configuration.properties
@@ -0,0 +1,5 @@
+# Properties for the com.springsource.configuratiuon.properties sample
+driverClassName   = org.w3.Driver
+username          = cgfrost
+url               = http://www.eclipse.org/virgo
+password          = reallySecret
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/.classpath b/org.eclipse.virgo.sample.configuration.properties.web/.classpath
new file mode 100644
index 0000000..f655d4a
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/.classpath
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java">
+		<attributes>
+			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/main/resources">
+		<attributes>
+			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.web/3.0.0.RELEASE/org.springframework.web-3.0.0.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.web/3.0.0.RELEASE/org.springframework.web-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RELEASE/org.springframework.beans-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.RELEASE/org.springframework.web.servlet-3.0.0.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.web.servlet/3.0.0.RELEASE/org.springframework.web.servlet-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RELEASE/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp.jstl/1.1.2/com.springsource.javax.servlet.jsp.jstl-1.1.2.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework.webflow/org.springframework.js/2.0.8.RELEASE/org.springframework.js-2.0.8.RELEASE.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.springframework.webflow/org.springframework.js/2.0.8.RELEASE/org.springframework.js-sources-2.0.8.RELEASE.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/>
+	<classpathentry kind="var" path="CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/CONFIGURATION_PROPERTIES_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.sample.configuration.properties.core"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/.project b/org.eclipse.virgo.sample.configuration.properties.web/.project
new file mode 100644
index 0000000..bc28d44
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/.project
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.virgo.sample.configuration.properties.web</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.springsource.server.ide.bundlor.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.springsource.server.ide.facet.core.bundlenature</nature>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/.settings/.jsdtscope b/org.eclipse.virgo.sample.configuration.properties.web/.settings/.jsdtscope
new file mode 100644
index 0000000..5d8de19
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/.settings/.jsdtscope
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="false"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.virgo.sample.configuration.properties.web/.settings/com.springsource.server.ide.bundlor.core.prefs
new file mode 100644
index 0000000..dea2208
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/.settings/com.springsource.server.ide.bundlor.core.prefs
@@ -0,0 +1,3 @@
+#Wed Jun 10 16:13:51 BST 2009
+com.springsource.server.ide.bundlor.core.template.properties.files=
+eclipse.preferences.version=1
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f26c14e
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Mon Aug 24 17:26:00 BST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.component b/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..ebc4447
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="com.springsource.server.admin.web">
+<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/js"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
+<property name="context-root" value="admin"/>
+<property name="java-output-path" value="/target/classes"/>
+</wb-module>
+</project-modules>
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..66f4e39
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.web"/>
+  <fixed facet="jst.java"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="com.springsource.server.bundle" version="1.0"/>
+  <installed facet="jst.java" version="5.0"/>
+</faceted-project>
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.container b/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000..3bd5d0a
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.name b/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000..05bd71b
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/.springBeans b/org.eclipse.virgo.sample.configuration.properties.web/.springBeans
new file mode 100644
index 0000000..34b281c
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/.springBeans
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[2.3.0.200912170948-RELEASE]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
+	<configs>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/build.xml b/org.eclipse.virgo.sample.configuration.properties.web/build.xml
new file mode 100644
index 0000000..5dcd36b
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/build.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.virgo.sample.configuration.properties.web">
+
+	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
+	<import file="${basedir}/../virgo-build/war/default.xml"/>
+	
+</project>
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/ivy.xml b/org.eclipse.virgo.sample.configuration.properties.web/ivy.xml
new file mode 100644
index 0000000..bec12ad
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/ivy.xml
@@ -0,0 +1,45 @@
+<?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.samples" module="${ant.project.name}"/>
+
+	<configurations>
+		<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}" type="war" ext="war"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+	</publications>
+
+	<dependencies>
+		<!-- === PROVIDED-COMPILE============================================ -->
+        <dependency org="org.eclipse.virgo.samples" name="org.eclipse.virgo.sample.configuration.properties.core" rev="latest.integration" conf="provided->compile"/>
+		<!-- === RUNTIME-DEFAULT =========================================== -->
+		<!-- === PROVIDED-RUNTIME =========================================== -->
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="${javax.servlet}" conf="provided->runtime"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="${javax.servlet.jsp}" conf="provided->runtime"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="${javax.servlet.jstl}" conf="provided->runtime"/>
+        <dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="${org.apache.taglibs.standard}" conf="provided->runtime"/>
+        <dependency org="org.apache.xmlcommons" name="com.springsource.org.apache.xmlcommons" rev="${org.apache.xmlcommons}" conf="provided->runtime"/>
+		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="provided->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="provided->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="provided->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.web" rev="${org.springframework}" conf="provided->runtime"/>
+        <dependency org="org.springframework" name="org.springframework.web.servlet" rev="${org.springframework}" conf="provided->runtime"/>
+		<dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="provided->runtime"/>		
+		<dependency org="org.springframework.webflow" name="org.springframework.js" rev="${org.springframework.js}" conf="provided->runtime"/>	
+		<!-- === TEST ====================================================== -->
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.spring.3}" conf="test->runtime"/>
+        <dependency org="org.springframework" name="org.springframework.test" rev="${org.springframework}" conf="test->runtime"/>
+		<dependency org="org.eclipse.virgo.teststubs" name="org.eclipse.virgo.teststubs.osgi" rev="${org.eclipse.virgo.teststubs}" conf="test->runtime"/>
+		
+		<override org="org.springframework" rev="${org.springframework}"/>
+	</dependencies>
+
+</ivy-module>
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/java/org/eclipse/virgo/sample/configuration/properties/web/PropertiesController.java b/org.eclipse.virgo.sample.configuration.properties.web/src/main/java/org/eclipse/virgo/sample/configuration/properties/web/PropertiesController.java
new file mode 100644
index 0000000..3cc9aa0
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/java/org/eclipse/virgo/sample/configuration/properties/web/PropertiesController.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * 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.sample.configuration.properties.web;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import org.eclipse.virgo.sample.configuration.properties.core.PropertiesService;
+
+
+/**
+ * <p>
+ * TODO Document AppController
+ * </p>
+ *
+ * <strong>Concurrent Semantics</strong><br />
+ *
+ * TODO Document concurrent semantics of AppController
+ *
+ */
+@Controller
+@RequestMapping("/properties")
+public final class PropertiesController {
+
+    @Autowired
+    private PropertiesService propertiesService;
+    
+    /**
+     * Custom handler for displaying a list of properties.
+     */
+    @RequestMapping("/overview")
+    public ModelAndView information() {
+        return new ModelAndView("properties").addObject("properties", this.propertiesService.getProperties());
+    }
+
+}
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/resources/.gitignore b/org.eclipse.virgo.sample.configuration.properties.web/src/main/resources/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/resources/.gitignore
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/META-INF/MANIFEST.MF b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..42e89aa
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0

+Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[

+ 1.1.2,1.3)",org.springframework.js;version="[2.0.7.RELEASE,3.0.0)"

+Bundle-Version: 2.0.0

+Tool: Bundlor 1.0.0.BUILD-20091207202403

+Bundle-Name: Configuration Sample Web Bundle

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.virgo.sample.configuration.properties

+ .web

+Web-ContextPath: config-properties

+Import-Package: javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.0)",or

+ g.apache.juli.logging.impl;version="[6.0.16,6.1)",org.eclipse.virgo.s

+ ample.configuration.properties.core;version="[2.0.0,2.5.0)",org.eclip

+ se.virgo.web.dm;version="[2.0.0,3.0.0)",org.springframework.beans.fac

+ tory.xml;version="[3.0,3.1)",org.springframework.context.config;versi

+ on="[3.0, 3.1)",org.springframework.context.support;version="[3.0,3.1

+ )",org.springframework.js.resource;version="[2.0.7.RELEASE,3.0.0)",or

+ g.springframework.web.context;version="[3.0,4.0)",org.springframework

+ .web.context.support;version="[3.0,3.1)",org.springframework.web.serv

+ let;version="[3.0,4.0)",org.springframework.web.servlet.handler;versi

+ on="[3.0,3.1)",org.springframework.web.servlet.mvc;version="[3.0,3.1)

+ ",org.springframework.web.servlet.mvc.annotation;version="[3.0,3.1)",

+ org.springframework.web.servlet.support;version="[3.0,3.1)",org.sprin

+ gframework.web.servlet.view;version="[3.0,3.1)"

+

diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/applicationContext.xml b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/applicationContext.xml
new file mode 100644
index 0000000..d58d75f
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:osgi="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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-3.0.xsd">
+
+	<osgi:reference id="propertiesService" interface="org.eclipse.virgo.sample.configuration.properties.core.PropertiesService" />
+	
+</beans>
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/jsp/properties.jsp b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/jsp/properties.jsp
new file mode 100644
index 0000000..9db256d
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/jsp/properties.jsp
@@ -0,0 +1,75 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %><%-- 
+--%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%-- 
+--%><!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" xml:lang="en" lang="en">
+<head>
+	<title>Configuration properties sample</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+	<link rel="shortcut icon" href="<c:url value="/resources/images/favicon.ico"  />" />
+	<link rel="stylesheet" href="<c:url value="/resources/styles/main.css"        />" type="text/css" />
+	<link rel="stylesheet" href="<c:url value="/resources/styles/local.css"       />" type="text/css" />
+	<link rel="stylesheet" href="<c:url value="/resources/styles/print.css"       />" type="text/css" media="print" />
+</head>
+<body class="main tundra">
+	<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>
+			<img id="left-curve" src="/config-properties/images/menu-curve-left.png"/>
+			<div id="primary-right">
+				<ul>
+					<li><a href="/admin" title="Admin Console">Admin Console</a></li>
+					<li><a href="http://www.eclipse.org/virgo" title="Virgo">Virgo</a></li>
+				</ul>
+			</div>
+			<img id="right-curve" src="/config-properties/images/menu-curve-right.png"/>
+		</div><!-- /primary-navigation -->
+
+		<div id="container">
+			<div id="content-no-nav">
+				<h1 class="title">Configuration properties sample</h1>
+				<p>
+					The following properties have been found in 'org.eclipse.virgo.sample.configuration'.
+				</p>
+				<table id="properties" class="bordered-table">
+					<tr>
+						<th>Name</th>
+						<th>Value</th>
+					</tr>
+					<c:choose>
+						<c:when test="${empty properties}">
+							<tr class="name-sublevel1-odd">
+								<td id="property_null" colspan="2">No properties have been registered.</td>
+							</tr>
+						</c:when>
+						<c:otherwise>
+							<c:forEach var="property" items="${properties}" varStatus="loopStatus">
+								<c:set var="rowStyle" value="odd" scope="page" />
+								<c:if test="${(loopStatus.index % 2) eq 0}">
+									<c:set var="rowStyle" value="even" scope="page" />
+								</c:if>
+								<tr class="sublevel1-${rowStyle}">
+									<td id="property_key">${property.key}</td>
+									<td id="property_value">${property.value}</td>
+								</tr>
+								<c:remove var="rowStyle" />
+							</c:forEach>
+						</c:otherwise>
+					</c:choose>
+				</table>
+			</div><!-- /content -->
+		</div><!-- /container -->
+
+	<div id="footer-wrapper">
+		<div id="footer-left">&copy; Copyright 2008, 2010 VMware Inc. Licensed under the Eclipse Public License v1.0.</div>
+		<div id="footer-right"></div> 
+	</div>
+	</div> <!-- /page-->
+</body>
+</html>
+
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/sample-servlet.xml b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/sample-servlet.xml
new file mode 100644
index 0000000..8fa829a
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/sample-servlet.xml
@@ -0,0 +1,18 @@
+<?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:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="
+				http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+
+	<context:component-scan base-package="org.eclipse.virgo.sample.configuration.properties.web" />
+
+	<!-- VIEW CONFIG  -->
+	
+	<bean id="topViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+		<property name="prefix" value="/WEB-INF/jsp/" />
+		<property name="suffix" value=".jsp" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/web.xml b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..d71a201
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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>Configuration Sample</display-name>
+
+	<description>Virgo Server - Configuration Sample</description>
+
+	<welcome-file-list>
+		<welcome-file>index.jsp</welcome-file>
+		<welcome-file>index.html</welcome-file>
+	</welcome-file-list>
+
+	<!-- CONFIGURE A PARENT APPLICATION CONTEXT -->
+
+	<context-param>
+		<param-name>contextClass</param-name>
+		<param-value>org.eclipse.virgo.web.dm.ServerOsgiBundleXmlWebApplicationContext</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+
+	<!-- DISPATCHER SERVLET CONFIG -->
+	<servlet>
+		<servlet-name>sample</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>sample</servlet-name>
+		<url-pattern>/web/*</url-pattern>
+	</servlet-mapping>
+	
+	<servlet>
+		<servlet-name>ResourceServlet</servlet-name>
+		<servlet-class>org.springframework.js.resource.ResourceServlet</servlet-class>
+	</servlet>
+	
+	<servlet-mapping>
+		<servlet-name>ResourceServlet</servlet-name>
+		<url-pattern>/resources/*</url-pattern>
+	</servlet-mapping>
+
+</web-app>
\ No newline at end of file
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/favicon.ico b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/favicon.ico
new file mode 100755
index 0000000..9244a9c
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/favicon.ico
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-left.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-left.png
new file mode 100644
index 0000000..8bfe3b1
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-left.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-right.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-right.png
new file mode 100644
index 0000000..51527ad
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-right.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-stretch.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-stretch.png
new file mode 100644
index 0000000..c58f721
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/footer-stretch.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-left.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-left.png
new file mode 100644
index 0000000..4920a0a
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-left.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-right.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-right.png
new file mode 100644
index 0000000..09b0a59
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/header-right.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-large.gif b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-large.gif
new file mode 100644
index 0000000..aa4ec5a
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-large.gif
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-small.gif b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-small.gif
new file mode 100644
index 0000000..75ad2b3
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/loader-white-small.gif
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-left.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-left.png
new file mode 100644
index 0000000..c48a2e0
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-left.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-right.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-right.png
new file mode 100644
index 0000000..1f3b100
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-curve-right.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-stretch.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-stretch.png
new file mode 100644
index 0000000..0ca66f7
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/menu-stretch.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-left.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-left.png
new file mode 100644
index 0000000..72551e7
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-left.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-right.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-right.png
new file mode 100644
index 0000000..8aaf50c
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/mini-header-right.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/server-splash.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/server-splash.png
new file mode 100644
index 0000000..f8fe1f9
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/server-splash.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/spring.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/spring.png
new file mode 100644
index 0000000..05a1940
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/spring.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/table-header-background.png b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/table-header-background.png
new file mode 100644
index 0000000..8f2ba1b
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/images/table-header-background.png
Binary files differ
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/index.html b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/index.html
new file mode 100644
index 0000000..9840cca
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+	<title>Virgo Sample</title>
+	<meta http-equiv="REFRESH" content="0;url=/config-properties/web/properties/overview">
+</head>
+<body>
+	<br/>
+	<br/>
+	<center>
+		<p>
+			<em>Loading sample...</em>
+		</p>
+		<img alt="" src="images/ajax-loader.gif">	
+	</center>
+</body>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/local.css b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/local.css
new file mode 100644
index 0000000..8bdb7f4
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/local.css
@@ -0,0 +1,36 @@
+/* 
+ *  Local style information for the Virgo Splash Screen
+ *
+ *  Contains both style and colour information and 
+ *  overrides content from the dojo/tundra style.
+ *
+ *  Christopher Frost - March 2010
+ *
+ */
+ 
+#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;
+}
+
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/main.css b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/main.css
new file mode 100644
index 0000000..ea3ccff
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/main.css
@@ -0,0 +1,289 @@
+/* 
+ * MAIN CSS
+ *
+ * All styles for the screen, other than color-specific styles,
+ * should be included here.  
+ *
+ * COMMON STYLES
+ */
+body {
+	font: 12px Helvetica, Arial, "Bitstream Vera Sans", sans-serif;
+	background-color: #dfdfdf;
+}
+
+#page {
+	margin: auto;
+	width: 800px;
+	color: #333;
+}
+
+/*
+ * HEADER STYLES
+ */
+#header {
+	background: #fff url(../images/header-right.png) no-repeat scroll right top;
+	width: 100%;
+	height: 100px;
+}
+
+#name-and-company {
+	background: transparent url(../images/header-left.png) no-repeat top left;
+	width: 100%;
+	height: 100px;
+	top: 0px;
+	left: 0px;
+}
+
+#site-name {
+	background: transparent url(../images/header-title-left.png) no-repeat scroll center center;
+	height: 100px;
+	width: 345px;
+}
+
+#site-name a, #site-name a:hover {
+	height: 60px;
+	width: 190px;
+}
+
+#company-name a, #site-name a:hover {
+	height: 60px;
+	width: 190px;
+}
+
+/*
+ * 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;
+}
+
+h3 {
+	font-size: 1em;
+	padding: 8px 0 5px 0;
+	color: #002E62;
+}
+
+h4 {
+	font-size: 1em;
+	padding-top: 8px;
+	color: #333;
+}
+
+h5 {
+	font-size: 1em;
+	padding-top: 6px;
+	color: #333;
+}
+
+/*
+ * 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-curve {
+	float: left;
+}
+
+#right-curve {
+	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;
+}
+
+/*
+ * TABLE STYLES
+ */
+table {
+	border-spacing: 0;
+	margin: 0;
+	border-collapse: collapse;
+	color:#666;
+}
+
+th {
+	height: 19px;
+	text-align: left;
+	font-weight: bold;
+	margin: 0;
+	padding: 3px 6px 0 6px;
+	line-height: 19px;
+	color:#333;
+}
+ 
+.bordered-table {
+	border:1px solid #BAD9EC;
+}
+
+.bordered-table th {
+	background-image: url(../images/table-header-background.png);
+	background-repeat: repeat-x;
+	white-space: nowrap;
+	border-bottom: 1px solid #BAD9EC;
+}
+
+td {
+	margin: 0;
+	padding: 4px 6px 4px 6px;
+	vertical-align: top;
+}
+
+td.table-icon {
+	padding-top: 2px;
+	padding-bottom: 1px;
+}
+
+.sublevel1-odd {
+	background:#fff;
+}
+ 
+.sublevel1-even {
+	background:#E8F6FF;
+}
+
+.two-tables {
+	width:100%;
+}
+
+.two-tables .left {
+	float:left;
+}
+
+.two-tables .right {
+	float:right;
+}
+
+/*
+ * 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;
+}
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/print.css b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/styles/print.css
new file mode 100644
index 0000000..3abe1c0
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/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/org.eclipse.virgo.sample.configuration.properties.web/src/test/java/.gitignore b/org.eclipse.virgo.sample.configuration.properties.web/src/test/java/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/test/java/.gitignore
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/test/resources/.gitignore b/org.eclipse.virgo.sample.configuration.properties.web/src/test/resources/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/test/resources/.gitignore
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/template.mf b/org.eclipse.virgo.sample.configuration.properties.web/template.mf
new file mode 100644
index 0000000..8074156
--- /dev/null
+++ b/org.eclipse.virgo.sample.configuration.properties.web/template.mf
@@ -0,0 +1,34 @@
+Manifest-Version: 1.0
+Bundle-Name: Configuration Sample Web Bundle
+Bundle-Version: 2.0.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.virgo.sample.configuration.properties.web
+Import-Template: 
+ org.eclipse.virgo.sample.configuration.properties.core;version="[2.0.0,2.5.0)",
+ org.springframework.*;version="[3.0,4.0)",
+ org.springframework.js;version="[2.0.7.RELEASE,3.0.0)",
+ org.apache.commons.logging;version="[1.1.1,1.1.1]",
+ javax.servlet.*;version="[2.1.0, 3.0.0)",
+ javax.xml.stream.*;version="0",
+ org.osgi.framework.*;version="0",
+ org.osgi.service.cm.*;version="0"
+Import-Bundle: 
+ com.springsource.org.apache.taglibs.standard;version="[1.1.2,1.3)",
+ org.springframework.js;version="[2.0.7.RELEASE,3.0.0)"
+Import-Package: 
+ javax.servlet.jsp.jstl.core;version="[1.1.2,1.2.0)",
+ org.eclipse.virgo.web.dm;version="[2.0.0,3.0.0)",
+ org.eclipse.virgo.sample.configuration.properties.core;version="[2.0.0,3.0.0)",
+ org.springframework.web.servlet.handler;version="[3.0,3.1)",
+ org.springframework.web.servlet.view;version="[3.0,3.1)",
+ org.springframework.web.servlet.mvc;version="[3.0,3.1)",
+ org.springframework.web.servlet.mvc.annotation;version="[3.0,3.1)",
+ org.springframework.web.servlet.support;version="[3.0,3.1)",
+ org.springframework.web.context.support;version="[3.0,3.1)",
+ org.springframework.context.support;version="[3.0,3.1)",
+ org.springframework.context.config;version="[3.0, 3.1)",
+ org.springframework.beans.factory.xml;version="[3.0,3.1)",
+ org.springframework.js.resource;version="[2.0.7.RELEASE,3.0.0)",
+ org.apache.juli.logging.impl;version="[6.0.16,6.1)"
+Excluded-Exports: *
+Web-ContextPath: config-properties