Index: readme.htm
===================================================================
--- readme.htm	(revision 454518)
+++ readme.htm	(working copy)
@@ -9,7 +9,6 @@
 <meta name=ProgId content=Word.Document>
 <meta name=Generator content="Microsoft Word 10">
 <meta name=Originator content="Microsoft Word 10">
-<link rel=File-List href="readme_files/filelist.xml">
 <title>Tuscany RDB DAS Sample</title>
 <o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
  name="place"/>
@@ -46,13 +45,8 @@
   </w:Compatibility>
   <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
  </w:WordDocument>
-</xml><![endif]--><!--[if !mso]><object
- classid="clsid:38481807-CA0E-42D2-BF39-B33AF135CC4D" id=ieooui></object>
+</xml><![endif]-->
 <style>
-st1\:*{behavior:url(#ieooui) }
-</style>
-<![endif]-->
-<style>
 <!--
  /* Font Definitions */
  @font-face
@@ -332,8 +326,6 @@
 	font-family:"Times New Roman";}
 </style>
 <![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="2050"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
  <o:shapelayout v:ext="edit">
   <o:idmap v:ext="edit" data="1"/>
  </o:shapelayout></xml><![endif]-->
@@ -450,66 +442,37 @@
 
 <h1>Running the sample</h1>
 
-<p class=MsoNormal>There are three options for running this sample:</p>
+<p class=MsoNormal>There are two options for running this sample:</p>
 
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>
 
 <ol style='margin-top:0in' start=1 type=1>
  <li class=MsoNormal style='mso-list:l6 level1 lfo12;tab-stops:list .5in'>Run
-     from Tomcat in the binary distribution</li>
- <li class=MsoNormal style='mso-list:l6 level1 lfo12;tab-stops:list .5in'>Run
      from Tomcat configured by the build</li>
- <li class=MsoNormal style='mso-list:l6 level1 lfo12;tab-stops:list .5in'>Run
-     from Tomcat you configure yourself</li>
+ <li class=MsoNormal style='mso-list:l6 level1 lfo12;tab-stops:list .5in'>
+	Deploying the CompanyWeb WAR into a Tomcat you configure yourself</li>
 </ol>
 
-<h3>Running from binary distribution</h3>
-
-<p class=MsoNormal>This sample is also pre-deployed in a Tomcat instance as
-part of the <st1:State><st1:place>Tuscany</st1:place></st1:State> binary
-distribution.<span style='mso-spacerun:yes'>  </span>When running the sample
-this way, you just:</p>
-
-<ul type=disc>
- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
-     mso-list:l9 level1 lfo11;tab-stops:list .5in'>Unzip the distribution
-     archive</li>
- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
-     mso-list:l9 level1 lfo11;tab-stops:list .5in'>Change the directory to
-     &nbsp;<b>apache-tomcat-5.5.17\bin</b><o:p></o:p></li>
- <ul type=circle>
-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
-      auto;mso-list:l9 level2 lfo11;tab-stops:list 1.0in'><span
-      style='mso-bidi-font-weight:bold'>If you start Tomcat from some other
-      location then it will not find the canned database</span></li>
- </ul>
- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
-     mso-list:l9 level1 lfo11;tab-stops:list .5in'>Execute: <code><span
-     style='font-size:10.0pt'>startup</span></code><code><span
-     style='mso-ansi-font-size:12.0pt;mso-bidi-font-size:12.0pt;font-family:
-     "Times New Roman"'><o:p></o:p></span></code></li>
- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
-     mso-list:l9 level1 lfo11;tab-stops:list .5in'>Point your browser to http://localhost:8080/sample-companyweb/</li>
-</ul>
-
 <h3>Running from Tomcat configured by the build<o:p></o:p></h3>
 
 <p class=MsoNormal>This sample application is deployed (along with the canned
 test database) to an instance of Tomcat as part of our automated sample
 testing.<span style='mso-spacerun:yes'>  </span>This means you can run the
-java/testing/tomcat build (see java/testing/tomcat/<span class=GramE>readme.htm
+java/das/samples/testing/tomcat build (see java/das/samples/testing/tomcat/<span class=GramE>readme.htm
 )</span><span style='mso-spacerun:yes'>  </span>and then access the application
 by pointing your browser to http://localhost:8080/sample-companyweb/.<span
 style='mso-spacerun:yes'>  </span></p>
 
-<h3>Running from Tomcat you configure yourself</h3>
+<h3>Deploying the CompanyWeb WAR into a Tomcat you configure yourself</h3>
 
 <p class=MsoNormal>Alternatively, you can deploy the sample to your own configured
 Tomcat installation by following the instructions below.<span
 style='mso-spacerun:yes'>  </span>These instructions assume that you have
 downloaded the <st1:State><st1:place>Tuscany</st1:place></st1:State> source and
-run our maven build.<span style='mso-spacerun:yes'>  </span><a
-href="https://svn.apache.org/repos/asf/incubator/tuscany/java/BUILDING.txt">https://svn.apache.org/repos/asf/incubator/tuscany/java/BUILDING.txt</a></p>
+run our maven build, see the following link to more details steps on how to 
+build DAS Sample applications
+<a href="http://incubator.apache.org/tuscany/java_das_overview.html">
+http://incubator.apache.org/tuscany/java_das_overview.html</a> .</p>
 
 <h1><span style='font-size:12.0pt;mso-bidi-font-size:16.0pt;font-family:"Times New Roman";
 mso-bidi-font-family:Arial;mso-font-kerning:0pt'>Set Up<o:p></o:p></span></h1>
@@ -529,23 +492,8 @@
  <li class=MsoNormal style='mso-list:l5 level1 lfo2;tab-stops:list .5in'>Move
      the following files (details in appendix) to {<span class=SpellE>Tomcat_Home</span>}/common/lib:</li>
  <ol style='margin-top:0in' start=1 type=a>
-  <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
-      class=SpellE>tuscany-das-rdb-xxx.jar</span></li>
-  <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
-      class=SpellE>sdo-api-xxx.jar</span></li>
-  <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
-      class=SpellE>tuscany-sdo-impl-xxx.jar</span></li>
-  <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
-      class=SpellE>xsd</span>{latest version}.jar</li>
-  <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
-      class=SpellE>ecore</span>-{latest version}.jar</li>
-  <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
-      class=SpellE>ecore</span>-change-{latest version}.jar</li>
-  <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
-      class=SpellE>ecore-xmi</span>-{latest version}.jar</li>
-  <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'>common-{latest
-      version}.jar</li>
-  <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'><span
+  <li class=MsoNormal style='mso-list:l5 level2 lfo2;tab-stops:list 1.0in'>
+	<span
       class=SpellE>derby.jar</span></li>
  </ol>
  <li class=MsoNormal style='mso-list:l5 level1 lfo2;tab-stops:list .5in'>Add
@@ -762,6 +710,9 @@
 </ul>
 
 <p class=MsoNormal><span style='font-size:10.0pt'><o:p>&nbsp;</o:p></span></p>
+<p class=MsoNormal><font size="2">&nbsp;&nbsp; Note: All these dependencies, 
+except for derby.jar are now included on the companyweb war file.</font></p>
+<p class=MsoNormal>&nbsp;</p>
 
 <p class=MsoNormal>Application artifact locations:</p>